fix: Move provider version constraint to required_providers block (#774)

terraform-google-modules · Dec 30, 2020 · 825f287 · 825f287
1 parent 4a61f76
commit 825f287
Show file tree

Hide file tree

Showing 17 changed files with 13 additions and 13 deletions.
diff --git a/auth.tf b/auth.tf
@@ -27,7 +27,6 @@ data "google_client_config" "default" {
   Configure provider
  *****************************************/
 provider "kubernetes" {
-  version                = "~> 1.10, != 1.11.0"
   load_config_file       = false
   host                   = "https://${local.cluster_endpoint}"
   token                  = data.google_client_config.default.access_token

diff --git a/autogen/main/auth.tf.tmpl b/autogen/main/auth.tf.tmpl
@@ -31,7 +31,6 @@ data "google_client_config" "default" {
   Configure provider
  *****************************************/
 provider "kubernetes" {
-  version                = "~> 1.10, != 1.11.0"
   load_config_file       = false
   host                   = "https://${local.cluster_endpoint}"
   token                  = data.google_client_config.default.access_token

diff --git a/autogen/main/versions.tf.tmpl b/autogen/main/versions.tf.tmpl
@@ -20,8 +20,10 @@ terraform {
   required_providers {
 {% if beta_cluster %}
     google-beta = ">= 3.42.0, <4.0.0"
+    kubernetes  = "~> 1.10, != 1.11.0"
 {% else %}
-    google = ">= 3.39.0, <4.0.0"
+    google     = ">= 3.39.0, <4.0.0"
+    kubernetes = "~> 1.10, != 1.11.0"
 {% endif %}
   }
 }
diff --git a/examples/workload_identity/main.tf b/examples/workload_identity/main.tf
@@ -24,7 +24,6 @@ provider "google" {
 }
 
 provider "kubernetes" {
-  version                = "~> 1.10, != 1.11.0"
   host                   = module.gke.endpoint
   token                  = data.google_client_config.default.access_token
   cluster_ca_certificate = base64decode(module.gke.ca_certificate)

diff --git a/modules/beta-private-cluster-update-variant/auth.tf b/modules/beta-private-cluster-update-variant/auth.tf
@@ -27,7 +27,6 @@ data "google_client_config" "default" {
   Configure provider
  *****************************************/
 provider "kubernetes" {
-  version                = "~> 1.10, != 1.11.0"
   load_config_file       = false
   host                   = "https://${local.cluster_endpoint}"
   token                  = data.google_client_config.default.access_token

diff --git a/modules/beta-private-cluster-update-variant/versions.tf b/modules/beta-private-cluster-update-variant/versions.tf
@@ -19,5 +19,6 @@ terraform {
 
   required_providers {
     google-beta = ">= 3.42.0, <4.0.0"
+    kubernetes  = "~> 1.10, != 1.11.0"
   }
 }
diff --git a/modules/beta-private-cluster/auth.tf b/modules/beta-private-cluster/auth.tf
@@ -27,7 +27,6 @@ data "google_client_config" "default" {
   Configure provider
  *****************************************/
 provider "kubernetes" {
-  version                = "~> 1.10, != 1.11.0"
   load_config_file       = false
   host                   = "https://${local.cluster_endpoint}"
   token                  = data.google_client_config.default.access_token

diff --git a/modules/beta-private-cluster/versions.tf b/modules/beta-private-cluster/versions.tf
@@ -19,5 +19,6 @@ terraform {
 
   required_providers {
     google-beta = ">= 3.42.0, <4.0.0"
+    kubernetes  = "~> 1.10, != 1.11.0"
   }
 }
diff --git a/modules/beta-public-cluster-update-variant/auth.tf b/modules/beta-public-cluster-update-variant/auth.tf
@@ -27,7 +27,6 @@ data "google_client_config" "default" {
   Configure provider
  *****************************************/
 provider "kubernetes" {
-  version                = "~> 1.10, != 1.11.0"
   load_config_file       = false
   host                   = "https://${local.cluster_endpoint}"
   token                  = data.google_client_config.default.access_token

diff --git a/modules/beta-public-cluster-update-variant/versions.tf b/modules/beta-public-cluster-update-variant/versions.tf
@@ -19,5 +19,6 @@ terraform {
 
   required_providers {
     google-beta = ">= 3.42.0, <4.0.0"
+    kubernetes  = "~> 1.10, != 1.11.0"
   }
 }
diff --git a/modules/beta-public-cluster/auth.tf b/modules/beta-public-cluster/auth.tf
@@ -27,7 +27,6 @@ data "google_client_config" "default" {
   Configure provider
  *****************************************/
 provider "kubernetes" {
-  version                = "~> 1.10, != 1.11.0"
   load_config_file       = false
   host                   = "https://${local.cluster_endpoint}"
   token                  = data.google_client_config.default.access_token

diff --git a/modules/beta-public-cluster/versions.tf b/modules/beta-public-cluster/versions.tf
@@ -19,5 +19,6 @@ terraform {
 
   required_providers {
     google-beta = ">= 3.42.0, <4.0.0"
+    kubernetes  = "~> 1.10, != 1.11.0"
   }
 }
diff --git a/modules/private-cluster-update-variant/auth.tf b/modules/private-cluster-update-variant/auth.tf
@@ -27,7 +27,6 @@ data "google_client_config" "default" {
   Configure provider
  *****************************************/
 provider "kubernetes" {
-  version                = "~> 1.10, != 1.11.0"
   load_config_file       = false
   host                   = "https://${local.cluster_endpoint}"
   token                  = data.google_client_config.default.access_token

diff --git a/modules/private-cluster-update-variant/versions.tf b/modules/private-cluster-update-variant/versions.tf
@@ -18,6 +18,7 @@ terraform {
   required_version = ">=0.12.6"
 
   required_providers {
-    google = ">= 3.39.0, <4.0.0"
+    google     = ">= 3.39.0, <4.0.0"
+    kubernetes = "~> 1.10, != 1.11.0"
   }
 }
diff --git a/modules/private-cluster/auth.tf b/modules/private-cluster/auth.tf
@@ -27,7 +27,6 @@ data "google_client_config" "default" {
   Configure provider
  *****************************************/
 provider "kubernetes" {
-  version                = "~> 1.10, != 1.11.0"
   load_config_file       = false
   host                   = "https://${local.cluster_endpoint}"
   token                  = data.google_client_config.default.access_token

diff --git a/modules/private-cluster/versions.tf b/modules/private-cluster/versions.tf
@@ -18,6 +18,7 @@ terraform {
   required_version = ">=0.12.6"
 
   required_providers {
-    google = ">= 3.39.0, <4.0.0"
+    google     = ">= 3.39.0, <4.0.0"
+    kubernetes = "~> 1.10, != 1.11.0"
   }
 }
diff --git a/versions.tf b/versions.tf
@@ -18,6 +18,7 @@ terraform {
   required_version = ">=0.12.6"
 
   required_providers {
-    google = ">= 3.39.0, <4.0.0"
+    google     = ">= 3.39.0, <4.0.0"
+    kubernetes = "~> 1.10, != 1.11.0"
   }
 }