Skip to content

Commit

Permalink
Merge pull request #148 from terraform-google-modules/hotfix/version-…
Browse files Browse the repository at this point in the history
…pin-google-provider

Version-pin all Google providers in examples to ~> 2.3.0
  • Loading branch information
aaron-lane committed May 2, 2019
2 parents abf62c5 + eba1fd5 commit d57d934
Show file tree
Hide file tree
Showing 12 changed files with 19 additions and 20 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ The [project factory](https://github.com/terraform-google-modules/terraform-goog
- [kubectl](https://github.com/kubernetes/kubernetes/releases) 1.9.x
#### Terraform and Plugins
- [Terraform](https://www.terraform.io/downloads.html) 0.11.x
- [terraform-provider-google](https://github.com/terraform-providers/terraform-provider-google) v2.0.0
- [terraform-provider-google](https://github.com/terraform-providers/terraform-provider-google) v2.3

### Configure a Service Account
In order to execute this module you must have a Service Account with the
Expand Down
4 changes: 2 additions & 2 deletions autogen/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -138,9 +138,9 @@ The [project factory](https://github.com/terraform-google-modules/terraform-goog
#### Terraform and Plugins
- [Terraform](https://www.terraform.io/downloads.html) 0.11.x
{% if private_cluster %}
- [terraform-provider-google-beta](https://github.com/terraform-providers/terraform-provider-google-beta) v2.0.0
- [terraform-provider-google-beta](https://github.com/terraform-providers/terraform-provider-google-beta) v2.3
{% else %}
- [terraform-provider-google](https://github.com/terraform-providers/terraform-provider-google) v2.0.0
- [terraform-provider-google](https://github.com/terraform-providers/terraform-provider-google) v2.3
{% endif %}

### Configure a Service Account
Expand Down
6 changes: 2 additions & 4 deletions examples/deploy_service/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ locals {
}

provider "google" {
version = "~> 2.2"
version = "~> 2.3.0"
region = "${var.region}"
}

provider "google-beta" {
version = "~> 2.2"
version = "~> 2.3.0"
region = "${var.region}"
}

Expand All @@ -45,8 +45,6 @@ module "gke" {
network = "${var.network}"
subnetwork = "${var.subnetwork}"

kubernetes_version = "1.11.7-gke.12"

ip_range_pods = "${var.ip_range_pods}"
ip_range_services = "${var.ip_range_services}"
service_account = "${var.compute_engine_service_account}"
Expand Down
1 change: 1 addition & 0 deletions examples/disable_client_cert/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ locals {
}

provider "google" {
version = "~> 2.3.0"
credentials = "${file(var.credentials_path)}"
region = "${var.region}"
}
Expand Down
4 changes: 2 additions & 2 deletions examples/node_pool/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ locals {
}

provider "google" {
version = "~> 2.2"
version = "~> 2.3.0"
region = "${var.region}"
}

provider "google-beta" {
version = "~> 2.2"
version = "~> 2.3.0"
region = "${var.region}"
}

Expand Down
4 changes: 2 additions & 2 deletions examples/shared_vpc/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ locals {
}

provider "google" {
version = "~> 2.2"
version = "~> 2.3.0"
region = "${var.region}"
}

provider "google-beta" {
version = "~> 2.2"
version = "~> 2.3.0"
region = "${var.region}"
}

Expand Down
4 changes: 2 additions & 2 deletions examples/simple_regional/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ locals {
}

provider "google" {
version = "~> 2.2"
version = "~> 2.3.0"
region = "${var.region}"
}

provider "google-beta" {
version = "~> 2.2"
version = "~> 2.3.0"
region = "${var.region}"
}

Expand Down
2 changes: 1 addition & 1 deletion examples/simple_regional_private/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ locals {
}

provider "google-beta" {
version = "~> 2.2"
version = "~> 2.3.0"
region = "${var.region}"
}

Expand Down
4 changes: 2 additions & 2 deletions examples/simple_zonal/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ locals {
}

provider "google" {
version = "~> 2.2"
version = "~> 2.3.0"
region = "${var.region}"
}

provider "google-beta" {
version = "~> 2.2"
version = "~> 2.3.0"
region = "${var.region}"
}

Expand Down
2 changes: 1 addition & 1 deletion examples/simple_zonal_private/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ locals {
}

provider "google-beta" {
version = "~> 2.2"
version = "~> 2.3.0"
region = "${var.region}"
}

Expand Down
4 changes: 2 additions & 2 deletions examples/stub_domains/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ locals {
}

provider "google" {
version = "~> 2.2"
version = "~> 2.3.0"
region = "${var.region}"
}

provider "google-beta" {
version = "~> 2.2"
version = "~> 2.3.0"
region = "${var.region}"
}

Expand Down
2 changes: 1 addition & 1 deletion modules/private-cluster/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ The [project factory](https://github.com/terraform-google-modules/terraform-goog
- [kubectl](https://github.com/kubernetes/kubernetes/releases) 1.9.x
#### Terraform and Plugins
- [Terraform](https://www.terraform.io/downloads.html) 0.11.x
- [terraform-provider-google-beta](https://github.com/terraform-providers/terraform-provider-google-beta) v2.0.0
- [terraform-provider-google-beta](https://github.com/terraform-providers/terraform-provider-google-beta) v2.3

### Configure a Service Account
In order to execute this module you must have a Service Account with the
Expand Down

0 comments on commit d57d934

Please sign in to comment.