From 44263e9117aa10bf0b260b89f4681bd91714cfb3 Mon Sep 17 00:00:00 2001 From: Bohdan Yurov Date: Thu, 24 Oct 2019 19:15:32 +0200 Subject: [PATCH] Fixes #261: Invalid plan when re-applying terraform module https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/issues/261 Bumbed minimal provider version to 2.18 --- autogen/versions.tf | 10 ++++++++++ examples/deploy_service/main.tf | 1 - examples/disable_client_cert/main.tf | 1 - examples/node_pool/main.tf | 1 - examples/node_pool_update_variant/main.tf | 1 - examples/shared_vpc/main.tf | 1 - examples/simple_regional/main.tf | 1 - examples/simple_regional_private/main.tf | 1 - examples/simple_zonal/main.tf | 1 - examples/simple_zonal_private/main.tf | 1 - examples/stub_domains/main.tf | 1 - examples/stub_domains_private/main.tf | 5 ----- examples/stub_domains_upstream_nameservers/main.tf | 1 - examples/upstream_nameservers/main.tf | 1 - examples/workload_metadata_config/main.tf | 1 - .../beta-private-cluster-update-variant/versions.tf | 4 ++++ modules/beta-private-cluster/versions.tf | 4 ++++ modules/beta-public-cluster/versions.tf | 4 ++++ modules/private-cluster-update-variant/versions.tf | 4 ++++ modules/private-cluster/versions.tf | 4 ++++ versions.tf | 4 ++++ 21 files changed, 34 insertions(+), 18 deletions(-) diff --git a/autogen/versions.tf b/autogen/versions.tf index 832ec1df39..523239b223 100644 --- a/autogen/versions.tf +++ b/autogen/versions.tf @@ -17,3 +17,13 @@ terraform { required_version = ">= 0.12" } + +{% if beta_cluster %} +provider "google-beta" { + version = "~> 2.17.0" +} +{% else %} +provider "google" { + version = "~> 2.17.0" +} +{% endif %} diff --git a/examples/deploy_service/main.tf b/examples/deploy_service/main.tf index 3e15164913..a8ad69b2f3 100644 --- a/examples/deploy_service/main.tf +++ b/examples/deploy_service/main.tf @@ -19,7 +19,6 @@ locals { } provider "google" { - version = "~> 2.12.0" region = var.region } diff --git a/examples/disable_client_cert/main.tf b/examples/disable_client_cert/main.tf index 221eb994ce..012613a6d0 100644 --- a/examples/disable_client_cert/main.tf +++ b/examples/disable_client_cert/main.tf @@ -19,7 +19,6 @@ locals { } provider "google" { - version = "~> 2.12.0" region = var.region } diff --git a/examples/node_pool/main.tf b/examples/node_pool/main.tf index 6662bb84ac..dfa8fd194d 100644 --- a/examples/node_pool/main.tf +++ b/examples/node_pool/main.tf @@ -19,7 +19,6 @@ locals { } provider "google-beta" { - version = "~> 2.12.0" region = var.region } diff --git a/examples/node_pool_update_variant/main.tf b/examples/node_pool_update_variant/main.tf index c10e797511..3b3798a32d 100644 --- a/examples/node_pool_update_variant/main.tf +++ b/examples/node_pool_update_variant/main.tf @@ -19,7 +19,6 @@ locals { } provider "google" { - version = "~> 2.12.0" region = var.region } diff --git a/examples/shared_vpc/main.tf b/examples/shared_vpc/main.tf index 766239ead8..dcfd75ce4b 100644 --- a/examples/shared_vpc/main.tf +++ b/examples/shared_vpc/main.tf @@ -19,7 +19,6 @@ locals { } provider "google" { - version = "~> 2.12.0" region = var.region } diff --git a/examples/simple_regional/main.tf b/examples/simple_regional/main.tf index 4662435fbd..d5dbe4d024 100644 --- a/examples/simple_regional/main.tf +++ b/examples/simple_regional/main.tf @@ -19,7 +19,6 @@ locals { } provider "google" { - version = "~> 2.12.0" region = var.region } diff --git a/examples/simple_regional_private/main.tf b/examples/simple_regional_private/main.tf index 89568e86ee..af7cb7ee76 100644 --- a/examples/simple_regional_private/main.tf +++ b/examples/simple_regional_private/main.tf @@ -19,7 +19,6 @@ locals { } provider "google" { - version = "~> 2.12.0" region = var.region } diff --git a/examples/simple_zonal/main.tf b/examples/simple_zonal/main.tf index edd90f7a0d..cce2766b47 100644 --- a/examples/simple_zonal/main.tf +++ b/examples/simple_zonal/main.tf @@ -19,7 +19,6 @@ locals { } provider "google" { - version = "~> 2.12.0" region = var.region } diff --git a/examples/simple_zonal_private/main.tf b/examples/simple_zonal_private/main.tf index 428218d76a..961380a18f 100644 --- a/examples/simple_zonal_private/main.tf +++ b/examples/simple_zonal_private/main.tf @@ -19,7 +19,6 @@ locals { } provider "google" { - version = "~> 2.12.0" region = var.region } diff --git a/examples/stub_domains/main.tf b/examples/stub_domains/main.tf index 37264f781b..120d5ac0e0 100644 --- a/examples/stub_domains/main.tf +++ b/examples/stub_domains/main.tf @@ -19,7 +19,6 @@ locals { } provider "google" { - version = "~> 2.12.0" region = var.region } diff --git a/examples/stub_domains_private/main.tf b/examples/stub_domains_private/main.tf index 65bc48247d..8b99bd1e14 100644 --- a/examples/stub_domains_private/main.tf +++ b/examples/stub_domains_private/main.tf @@ -15,14 +15,9 @@ */ provider "google" { - version = "~> 2.12.0" region = var.region } -provider "random" { - version = "~> 2.1" -} - data "google_compute_subnetwork" "subnetwork" { name = var.subnetwork project = var.project_id diff --git a/examples/stub_domains_upstream_nameservers/main.tf b/examples/stub_domains_upstream_nameservers/main.tf index 0da83b95c6..2509f4b5fb 100644 --- a/examples/stub_domains_upstream_nameservers/main.tf +++ b/examples/stub_domains_upstream_nameservers/main.tf @@ -19,7 +19,6 @@ locals { } provider "google" { - version = "~> 2.12.0" region = var.region } diff --git a/examples/upstream_nameservers/main.tf b/examples/upstream_nameservers/main.tf index ecded7c29c..a90f0d7d31 100644 --- a/examples/upstream_nameservers/main.tf +++ b/examples/upstream_nameservers/main.tf @@ -19,7 +19,6 @@ locals { } provider "google" { - version = "~> 2.12.0" region = var.region } diff --git a/examples/workload_metadata_config/main.tf b/examples/workload_metadata_config/main.tf index f9fb25da5b..56780d7a5f 100644 --- a/examples/workload_metadata_config/main.tf +++ b/examples/workload_metadata_config/main.tf @@ -19,7 +19,6 @@ locals { } provider "google-beta" { - version = "~> 2.12.0" region = var.region } diff --git a/modules/beta-private-cluster-update-variant/versions.tf b/modules/beta-private-cluster-update-variant/versions.tf index 832ec1df39..d5d8444010 100644 --- a/modules/beta-private-cluster-update-variant/versions.tf +++ b/modules/beta-private-cluster-update-variant/versions.tf @@ -17,3 +17,7 @@ terraform { required_version = ">= 0.12" } + +provider "google-beta" { + version = "~> 2.17.0" +} diff --git a/modules/beta-private-cluster/versions.tf b/modules/beta-private-cluster/versions.tf index 832ec1df39..d5d8444010 100644 --- a/modules/beta-private-cluster/versions.tf +++ b/modules/beta-private-cluster/versions.tf @@ -17,3 +17,7 @@ terraform { required_version = ">= 0.12" } + +provider "google-beta" { + version = "~> 2.17.0" +} diff --git a/modules/beta-public-cluster/versions.tf b/modules/beta-public-cluster/versions.tf index 832ec1df39..d5d8444010 100644 --- a/modules/beta-public-cluster/versions.tf +++ b/modules/beta-public-cluster/versions.tf @@ -17,3 +17,7 @@ terraform { required_version = ">= 0.12" } + +provider "google-beta" { + version = "~> 2.17.0" +} diff --git a/modules/private-cluster-update-variant/versions.tf b/modules/private-cluster-update-variant/versions.tf index 832ec1df39..0936923a84 100644 --- a/modules/private-cluster-update-variant/versions.tf +++ b/modules/private-cluster-update-variant/versions.tf @@ -17,3 +17,7 @@ terraform { required_version = ">= 0.12" } + +provider "google" { + version = "~> 2.17.0" +} diff --git a/modules/private-cluster/versions.tf b/modules/private-cluster/versions.tf index 832ec1df39..0936923a84 100644 --- a/modules/private-cluster/versions.tf +++ b/modules/private-cluster/versions.tf @@ -17,3 +17,7 @@ terraform { required_version = ">= 0.12" } + +provider "google" { + version = "~> 2.17.0" +} diff --git a/versions.tf b/versions.tf index 832ec1df39..0936923a84 100644 --- a/versions.tf +++ b/versions.tf @@ -17,3 +17,7 @@ terraform { required_version = ">= 0.12" } + +provider "google" { + version = "~> 2.17.0" +}