From 825f287351b1b7a8c832150072371452ff498bd2 Mon Sep 17 00:00:00 2001 From: Raj Saxena Date: Thu, 31 Dec 2020 00:06:51 +0530 Subject: [PATCH] fix: Move provider version constraint to required_providers block (#774) --- auth.tf | 1 - autogen/main/auth.tf.tmpl | 1 - autogen/main/versions.tf.tmpl | 4 +++- examples/workload_identity/main.tf | 1 - modules/beta-private-cluster-update-variant/auth.tf | 1 - modules/beta-private-cluster-update-variant/versions.tf | 1 + modules/beta-private-cluster/auth.tf | 1 - modules/beta-private-cluster/versions.tf | 1 + modules/beta-public-cluster-update-variant/auth.tf | 1 - modules/beta-public-cluster-update-variant/versions.tf | 1 + modules/beta-public-cluster/auth.tf | 1 - modules/beta-public-cluster/versions.tf | 1 + modules/private-cluster-update-variant/auth.tf | 1 - modules/private-cluster-update-variant/versions.tf | 3 ++- modules/private-cluster/auth.tf | 1 - modules/private-cluster/versions.tf | 3 ++- versions.tf | 3 ++- 17 files changed, 13 insertions(+), 13 deletions(-) diff --git a/auth.tf b/auth.tf index 0cbeebafb..be384e3dd 100644 --- 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 index c6273ec3d..a23689bb7 100644 --- 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 index 22ffcde1c..b362c3e0d 100644 --- 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 index 2a1d89165..a2168fb68 100644 --- 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 index 5601ede1e..0fe8d5a8d 100644 --- 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 index b461e3a71..298949688 100644 --- 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 index 5601ede1e..0fe8d5a8d 100644 --- 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 index b461e3a71..298949688 100644 --- 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 index 5601ede1e..0fe8d5a8d 100644 --- 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 index b461e3a71..298949688 100644 --- 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 index 5601ede1e..0fe8d5a8d 100644 --- 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 index b461e3a71..298949688 100644 --- 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 index 0cbeebafb..be384e3dd 100644 --- 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 index 7c0059bbd..6628273a1 100644 --- 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 index 0cbeebafb..be384e3dd 100644 --- 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 index 7c0059bbd..6628273a1 100644 --- 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 index 7c0059bbd..6628273a1 100644 --- 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" } }