Fixes terraform-google-modules#261: Invalid plan when re-applying ter…

…raform module terraform-google-modules#261 Bumbed minimal provider version to 2.17
bohdanyurov-gl · Oct 28, 2019 · a040de6 · a040de6
1 parent adf341e
commit a040de6
Show file tree

Hide file tree

Showing 21 changed files with 34 additions and 18 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -17,3 +17,7 @@
 terraform {
   required_version = ">= 0.12"
 }
+
+provider "google" {
+  version = "~> 2.17.0"
+}
diff --git a/versions.tf b/versions.tf
@@ -17,3 +17,7 @@
 terraform {
   required_version = ">= 0.12"
 }
+
+provider "google" {
+  version = "~> 2.17.0"
+}