From 83eae8fe9a4429857ea2615ee81a0b342ac22c8c Mon Sep 17 00:00:00 2001 From: Jason Berlinsky Date: Wed, 1 May 2019 17:50:09 -0400 Subject: [PATCH 1/3] Version-pin all Google providers in examples to ~> 2.3.0 --- examples/deploy_service/main.tf | 4 ++-- examples/disable_client_cert/main.tf | 1 + examples/node_pool/main.tf | 4 ++-- examples/shared_vpc/main.tf | 4 ++-- examples/simple_regional/main.tf | 4 ++-- examples/simple_regional_private/main.tf | 2 +- examples/simple_zonal/main.tf | 4 ++-- examples/simple_zonal_private/main.tf | 2 +- examples/stub_domains/main.tf | 4 ++-- 9 files changed, 15 insertions(+), 14 deletions(-) diff --git a/examples/deploy_service/main.tf b/examples/deploy_service/main.tf index 3b811053bf..1c4b5b9734 100644 --- a/examples/deploy_service/main.tf +++ b/examples/deploy_service/main.tf @@ -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}" } diff --git a/examples/disable_client_cert/main.tf b/examples/disable_client_cert/main.tf index 550ed7ce1d..47391e4f9c 100644 --- a/examples/disable_client_cert/main.tf +++ b/examples/disable_client_cert/main.tf @@ -19,6 +19,7 @@ locals { } provider "google" { + version = "~> 2.3.0" credentials = "${file(var.credentials_path)}" region = "${var.region}" } diff --git a/examples/node_pool/main.tf b/examples/node_pool/main.tf index 1091459662..6e7af7c475 100644 --- a/examples/node_pool/main.tf +++ b/examples/node_pool/main.tf @@ -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}" } diff --git a/examples/shared_vpc/main.tf b/examples/shared_vpc/main.tf index ec732c9c08..fa9e17d114 100644 --- a/examples/shared_vpc/main.tf +++ b/examples/shared_vpc/main.tf @@ -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}" } diff --git a/examples/simple_regional/main.tf b/examples/simple_regional/main.tf index 81fb0381f7..951f41c1e2 100644 --- a/examples/simple_regional/main.tf +++ b/examples/simple_regional/main.tf @@ -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}" } diff --git a/examples/simple_regional_private/main.tf b/examples/simple_regional_private/main.tf index 0b2ffcf90c..b891b3d360 100644 --- a/examples/simple_regional_private/main.tf +++ b/examples/simple_regional_private/main.tf @@ -19,7 +19,7 @@ locals { } provider "google-beta" { - version = "~> 2.2" + version = "~> 2.3.0" region = "${var.region}" } diff --git a/examples/simple_zonal/main.tf b/examples/simple_zonal/main.tf index 904dbc9e51..e90a124815 100644 --- a/examples/simple_zonal/main.tf +++ b/examples/simple_zonal/main.tf @@ -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}" } diff --git a/examples/simple_zonal_private/main.tf b/examples/simple_zonal_private/main.tf index e0ba0cbdb3..1e9a4e3bd8 100644 --- a/examples/simple_zonal_private/main.tf +++ b/examples/simple_zonal_private/main.tf @@ -19,7 +19,7 @@ locals { } provider "google-beta" { - version = "~> 2.2" + version = "~> 2.3.0" region = "${var.region}" } diff --git a/examples/stub_domains/main.tf b/examples/stub_domains/main.tf index 70ace9d6c9..32a703c89e 100644 --- a/examples/stub_domains/main.tf +++ b/examples/stub_domains/main.tf @@ -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}" } From 7ea8a917f384a70ec605702709ad8c4dafe39060 Mon Sep 17 00:00:00 2001 From: Aaron Lane Date: Wed, 1 May 2019 19:36:07 -0400 Subject: [PATCH 2/3] Drop kubernetes_version in deploy_service example The specified version is no longer supported. --- examples/deploy_service/main.tf | 2 -- 1 file changed, 2 deletions(-) diff --git a/examples/deploy_service/main.tf b/examples/deploy_service/main.tf index 1c4b5b9734..ba9375e2e7 100644 --- a/examples/deploy_service/main.tf +++ b/examples/deploy_service/main.tf @@ -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}" From eba1fd5e6dfa296b07670923ca071fad79b07bc6 Mon Sep 17 00:00:00 2001 From: Aaron Lane Date: Wed, 1 May 2019 19:42:14 -0400 Subject: [PATCH 3/3] Update supported provider version in README --- README.md | 2 +- autogen/README.md | 4 ++-- modules/private-cluster/README.md | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 6ba05b9aab..d952f10f0b 100644 --- a/README.md +++ b/README.md @@ -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 diff --git a/autogen/README.md b/autogen/README.md index 79c709d978..40b9d05276 100644 --- a/autogen/README.md +++ b/autogen/README.md @@ -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 diff --git a/modules/private-cluster/README.md b/modules/private-cluster/README.md index cfb176f157..74f2f84b76 100644 --- a/modules/private-cluster/README.md +++ b/modules/private-cluster/README.md @@ -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