From c388a33a0675bf91295489a0a60354949e829cb5 Mon Sep 17 00:00:00 2001 From: Marko Vlahovic Date: Thu, 27 Jun 2019 10:40:10 -0700 Subject: [PATCH 1/3] Updating google providers to 2.9 --- README.md | 2 +- autogen/README.md | 4 ++-- examples/deploy_service/main.tf | 4 ++-- examples/disable_client_cert/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 ++-- modules/beta-private-cluster/README.md | 2 +- modules/beta-public-cluster/README.md | 2 +- modules/private-cluster/README.md | 2 +- 13 files changed, 20 insertions(+), 20 deletions(-) diff --git a/README.md b/README.md index 10f333ce32..1d068e03ab 100644 --- a/README.md +++ b/README.md @@ -198,7 +198,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.3, v2.6, v2.7 +- [terraform-provider-google](https://github.com/terraform-providers/terraform-provider-google) v2.3, v2.6, v2.9 ### 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 f40b26aefc..53b7d4b615 100644 --- a/autogen/README.md +++ b/autogen/README.md @@ -142,9 +142,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 or beta_cluster %} -- [terraform-provider-google-beta](https://github.com/terraform-providers/terraform-provider-google-beta) v2.3, v2.6, v2.7 +- [terraform-provider-google-beta](https://github.com/terraform-providers/terraform-provider-google-beta) v2.3, v2.6, v2.9 {% else %} -- [terraform-provider-google](https://github.com/terraform-providers/terraform-provider-google) v2.3, v2.6, v2.7 +- [terraform-provider-google](https://github.com/terraform-providers/terraform-provider-google) v2.3, v2.6, v2.9 {% endif %} ### Configure a Service Account diff --git a/examples/deploy_service/main.tf b/examples/deploy_service/main.tf index 05a0acbd90..f11e5b197d 100644 --- a/examples/deploy_service/main.tf +++ b/examples/deploy_service/main.tf @@ -19,12 +19,12 @@ locals { } provider "google" { - version = "~> 2.7.0" + version = "~> 2.9.0" region = "${var.region}" } provider "google-beta" { - version = "~> 2.7.0" + version = "~> 2.9.0" region = "${var.region}" } diff --git a/examples/disable_client_cert/main.tf b/examples/disable_client_cert/main.tf index 3f27c8a170..b73b2989f0 100644 --- a/examples/disable_client_cert/main.tf +++ b/examples/disable_client_cert/main.tf @@ -19,12 +19,12 @@ locals { } provider "google" { - version = "~> 2.7.0" + version = "~> 2.9.0" region = "${var.region}" } provider "google-beta" { - version = "~> 2.7.0" + version = "~> 2.9.0" region = "${var.region}" } diff --git a/examples/shared_vpc/main.tf b/examples/shared_vpc/main.tf index b778f039ce..41ff5166be 100644 --- a/examples/shared_vpc/main.tf +++ b/examples/shared_vpc/main.tf @@ -19,12 +19,12 @@ locals { } provider "google" { - version = "~> 2.7.0" + version = "~> 2.9.0" region = "${var.region}" } provider "google-beta" { - version = "~> 2.7.0" + version = "~> 2.9.0" region = "${var.region}" } diff --git a/examples/simple_regional/main.tf b/examples/simple_regional/main.tf index 007f64d38d..a560a771d5 100644 --- a/examples/simple_regional/main.tf +++ b/examples/simple_regional/main.tf @@ -19,12 +19,12 @@ locals { } provider "google" { - version = "~> 2.7.0" + version = "~> 2.9.0" region = "${var.region}" } provider "google-beta" { - version = "~> 2.7.0" + version = "~> 2.9.0" region = "${var.region}" } diff --git a/examples/simple_regional_private/main.tf b/examples/simple_regional_private/main.tf index 29ffe9528e..af88586552 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.7.0" + version = "~> 2.9.0" region = "${var.region}" } diff --git a/examples/simple_zonal/main.tf b/examples/simple_zonal/main.tf index 734f3a6457..984152d803 100644 --- a/examples/simple_zonal/main.tf +++ b/examples/simple_zonal/main.tf @@ -19,12 +19,12 @@ locals { } provider "google" { - version = "~> 2.7.0" + version = "~> 2.9.0" region = "${var.region}" } provider "google-beta" { - version = "~> 2.7.0" + version = "~> 2.9.0" region = "${var.region}" } diff --git a/examples/simple_zonal_private/main.tf b/examples/simple_zonal_private/main.tf index e5d643e9d3..4edcdb384a 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.7.0" + version = "~> 2.9.0" region = "${var.region}" } diff --git a/examples/stub_domains/main.tf b/examples/stub_domains/main.tf index 5f60993ea1..d4d91fffb5 100644 --- a/examples/stub_domains/main.tf +++ b/examples/stub_domains/main.tf @@ -19,12 +19,12 @@ locals { } provider "google" { - version = "~> 2.7.0" + version = "~> 2.9.0" region = "${var.region}" } provider "google-beta" { - version = "~> 2.7.0" + version = "~> 2.9.0" region = "${var.region}" } diff --git a/modules/beta-private-cluster/README.md b/modules/beta-private-cluster/README.md index 3230682bc8..004db9aca7 100644 --- a/modules/beta-private-cluster/README.md +++ b/modules/beta-private-cluster/README.md @@ -217,7 +217,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.3, v2.6, v2.7 +- [terraform-provider-google-beta](https://github.com/terraform-providers/terraform-provider-google-beta) v2.3, v2.6, v2.9 ### Configure a Service Account In order to execute this module you must have a Service Account with the diff --git a/modules/beta-public-cluster/README.md b/modules/beta-public-cluster/README.md index 5e8c2514f2..c898bb2e74 100644 --- a/modules/beta-public-cluster/README.md +++ b/modules/beta-public-cluster/README.md @@ -208,7 +208,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.3, v2.6, v2.7 +- [terraform-provider-google-beta](https://github.com/terraform-providers/terraform-provider-google-beta) v2.3, v2.6, v2.9 ### Configure a Service Account In order to execute this module you must have a Service Account with the diff --git a/modules/private-cluster/README.md b/modules/private-cluster/README.md index 371ca009c8..914ca81837 100644 --- a/modules/private-cluster/README.md +++ b/modules/private-cluster/README.md @@ -207,7 +207,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.3, v2.6, v2.7 +- [terraform-provider-google-beta](https://github.com/terraform-providers/terraform-provider-google-beta) v2.3, v2.6, v2.9 ### Configure a Service Account In order to execute this module you must have a Service Account with the From 4c8f8f5070cdc970244f6ea728b327e6e4d62d16 Mon Sep 17 00:00:00 2001 From: Marko Vlahovic Date: Thu, 27 Jun 2019 13:54:22 -0700 Subject: [PATCH 2/3] Reverting test changes --- test/integration/node_pool/controls/kubectl.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/integration/node_pool/controls/kubectl.rb b/test/integration/node_pool/controls/kubectl.rb index fb11abad17..8804d6e83e 100644 --- a/test/integration/node_pool/controls/kubectl.rb +++ b/test/integration/node_pool/controls/kubectl.rb @@ -73,13 +73,13 @@ end it "has the expected taints" do - expect(taints).to include( + expect(taints).to eq([ { effect: "PreferNoSchedule", key: "all-pools-example", value: "true", } - ) + ]) end end end From 272156cd04f0cb29b574e4077edcfe81dd74d3e8 Mon Sep 17 00:00:00 2001 From: Marko Vlahovic Date: Thu, 27 Jun 2019 14:51:25 -0700 Subject: [PATCH 3/3] Reverting change to test/integration/node_pool/controls/kubectl.rb --- test/integration/node_pool/controls/kubectl.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/integration/node_pool/controls/kubectl.rb b/test/integration/node_pool/controls/kubectl.rb index 8804d6e83e..fb11abad17 100644 --- a/test/integration/node_pool/controls/kubectl.rb +++ b/test/integration/node_pool/controls/kubectl.rb @@ -73,13 +73,13 @@ end it "has the expected taints" do - expect(taints).to eq([ + expect(taints).to include( { effect: "PreferNoSchedule", key: "all-pools-example", value: "true", } - ]) + ) end end end