feat!: K8s provider upgrade (#892)

pib · bharathkkb · web-flow · commit 9172b3eaeeb8 · 2021-05-17T15:33:19.000-05:00
* Update kubernetes provider to ~&gt; 2.0

* Remove interpolation-only expressions to make docker_test_lint happy

Co-authored-by: Bharath KKB &lt;bharathkrishnakb@gmail.com&gt;
diff --git a/README.md b/README.md
@@ -25,7 +25,6 @@ There are multiple examples included in the [examples](https://github.com/terraf
 data "google_client_config" "default" {}
 
 provider "kubernetes" {
-  load_config_file       = false
   host                   = "https://${module.gke.endpoint}"
   token                  = data.google_client_config.default.access_token
   cluster_ca_certificate = base64decode(module.gke.ca_certificate)
diff --git a/autogen/main/README.md b/autogen/main/README.md
@@ -55,7 +55,6 @@ There are multiple examples included in the [examples](https://github.com/terraf
 data "google_client_config" "default" {}
 
 provider "kubernetes" {
-  load_config_file       = false
   host                   = "https://${module.gke.endpoint}"
   token                  = data.google_client_config.default.access_token
   cluster_ca_certificate = base64decode(module.gke.ca_certificate)
diff --git a/autogen/main/versions.tf.tmpl b/autogen/main/versions.tf.tmpl
@@ -28,7 +28,7 @@ terraform {
     }
     kubernetes = {
       source  = "hashicorp/kubernetes"
-      version = "~> 1.10, != 1.11.0"
+      version = "~> 2.0"
     }
   }
   provider_meta "google-beta" {
@@ -42,7 +42,7 @@ terraform {
     }
     kubernetes = {
       source  = "hashicorp/kubernetes"
-      version = "~> 1.10, != 1.11.0"
+      version = "~> 2.0"
     }
   }
   provider_meta "google" {
diff --git a/examples/deploy_service/main.tf b/examples/deploy_service/main.tf
@@ -26,7 +26,6 @@ provider "google" {
 data "google_client_config" "default" {}
 
 provider "kubernetes" {
-  load_config_file       = false
   host                   = "https://${module.gke.endpoint}"
   token                  = data.google_client_config.default.access_token
   cluster_ca_certificate = base64decode(module.gke.ca_certificate)
diff --git a/examples/disable_client_cert/main.tf b/examples/disable_client_cert/main.tf
@@ -26,7 +26,6 @@ provider "google" {
 data "google_client_config" "default" {}
 
 provider "kubernetes" {
-  load_config_file       = false
   host                   = "https://${module.gke.endpoint}"
   token                  = data.google_client_config.default.access_token
   cluster_ca_certificate = base64decode(module.gke.ca_certificate)
diff --git a/examples/node_pool/main.tf b/examples/node_pool/main.tf
@@ -26,7 +26,6 @@ provider "google-beta" {
 data "google_client_config" "default" {}
 
 provider "kubernetes" {
-  load_config_file       = false
   host                   = "https://${module.gke.endpoint}"
   token                  = data.google_client_config.default.access_token
   cluster_ca_certificate = base64decode(module.gke.ca_certificate)
diff --git a/examples/node_pool_update_variant/main.tf b/examples/node_pool_update_variant/main.tf
@@ -32,7 +32,6 @@ data "google_compute_subnetwork" "subnetwork" {
 data "google_client_config" "default" {}
 
 provider "kubernetes" {
-  load_config_file       = false
   host                   = "https://${module.gke.endpoint}"
   token                  = data.google_client_config.default.access_token
   cluster_ca_certificate = base64decode(module.gke.ca_certificate)
diff --git a/examples/node_pool_update_variant_beta/main.tf b/examples/node_pool_update_variant_beta/main.tf
@@ -33,7 +33,6 @@ data "google_compute_subnetwork" "subnetwork" {
 data "google_client_config" "default" {}
 
 provider "kubernetes" {
-  load_config_file       = false
   host                   = "https://${module.gke.endpoint}"
   token                  = data.google_client_config.default.access_token
   cluster_ca_certificate = base64decode(module.gke.ca_certificate)
diff --git a/examples/node_pool_update_variant_public_beta/main.tf b/examples/node_pool_update_variant_public_beta/main.tf
@@ -33,7 +33,6 @@ data "google_compute_subnetwork" "subnetwork" {
 data "google_client_config" "default" {}
 
 provider "kubernetes" {
-  load_config_file       = false
   host                   = "https://${module.gke.endpoint}"
   token                  = data.google_client_config.default.access_token
   cluster_ca_certificate = base64decode(module.gke.ca_certificate)
diff --git a/examples/private_zonal_with_networking/main.tf b/examples/private_zonal_with_networking/main.tf
@@ -17,7 +17,6 @@
 data "google_client_config" "default" {}
 
 provider "kubernetes" {
-  load_config_file       = false
   host                   = "https://${module.gke.endpoint}"
   token                  = data.google_client_config.default.access_token
   cluster_ca_certificate = base64decode(module.gke.ca_certificate)
@@ -39,7 +38,7 @@ module "gcp-network" {
   ]
 
   secondary_ranges = {
-    "${var.subnetwork}" = [
+    (var.subnetwork) = [
       {
         range_name    = var.ip_range_pods_name
         ip_cidr_range = "192.168.0.0/18"
diff --git a/examples/regional_private_node_pool_oauth_scopes/provider.tf b/examples/regional_private_node_pool_oauth_scopes/provider.tf
@@ -25,7 +25,6 @@ provider "google-beta" {
 data "google_client_config" "default" {}
 
 provider "kubernetes" {
-  load_config_file       = false
   host                   = "https://${module.gke.endpoint}"
   token                  = data.google_client_config.default.access_token
   cluster_ca_certificate = base64decode(module.gke.ca_certificate)
diff --git a/examples/safer_cluster/main.tf b/examples/safer_cluster/main.tf
@@ -41,7 +41,6 @@ provider "google-beta" {
 data "google_client_config" "default" {}
 
 provider "kubernetes" {
-  load_config_file       = false
   host                   = "https://${module.gke.endpoint}"
   token                  = data.google_client_config.default.access_token
   cluster_ca_certificate = base64decode(module.gke.ca_certificate)
diff --git a/examples/safer_cluster/network.tf b/examples/safer_cluster/network.tf
@@ -34,7 +34,7 @@ module "gcp-network" {
   ]
 
   secondary_ranges = {
-    "${local.subnet_name}" = [
+    (local.subnet_name) = [
       {
         range_name    = local.pods_range_name
         ip_cidr_range = "192.168.0.0/18"
diff --git a/examples/safer_cluster_iap_bastion/network.tf b/examples/safer_cluster_iap_bastion/network.tf
@@ -33,7 +33,7 @@ module "vpc" {
     }
   ]
   secondary_ranges = {
-    "${var.subnet_name}" = [
+    (var.subnet_name) = [
       {
         range_name    = var.ip_range_pods_name
         ip_cidr_range = "192.168.0.0/18"
diff --git a/examples/safer_cluster_iap_bastion/provider.tf b/examples/safer_cluster_iap_bastion/provider.tf
@@ -25,7 +25,6 @@ provider "google-beta" {
 data "google_client_config" "default" {}
 
 provider "kubernetes" {
-  load_config_file       = false
   host                   = "https://${module.gke.endpoint}"
   token                  = data.google_client_config.default.access_token
   cluster_ca_certificate = base64decode(module.gke.ca_certificate)
diff --git a/examples/shared_vpc/main.tf b/examples/shared_vpc/main.tf
@@ -26,7 +26,6 @@ provider "google" {
 data "google_client_config" "default" {}
 
 provider "kubernetes" {
-  load_config_file       = false
   host                   = "https://${module.gke.endpoint}"
   token                  = data.google_client_config.default.access_token
   cluster_ca_certificate = base64decode(module.gke.ca_certificate)
diff --git a/examples/simple_regional/main.tf b/examples/simple_regional/main.tf
@@ -26,7 +26,6 @@ provider "google" {
 data "google_client_config" "default" {}
 
 provider "kubernetes" {
-  load_config_file       = false
   host                   = "https://${module.gke.endpoint}"
   token                  = data.google_client_config.default.access_token
   cluster_ca_certificate = base64decode(module.gke.ca_certificate)
diff --git a/examples/simple_regional_beta/main.tf b/examples/simple_regional_beta/main.tf
@@ -26,7 +26,6 @@ provider "google-beta" {
 data "google_client_config" "default" {}
 
 provider "kubernetes" {
-  load_config_file       = false
   host                   = "https://${module.gke.endpoint}"
   token                  = data.google_client_config.default.access_token
   cluster_ca_certificate = base64decode(module.gke.ca_certificate)
diff --git a/examples/simple_regional_private/main.tf b/examples/simple_regional_private/main.tf
@@ -26,7 +26,6 @@ provider "google" {
 data "google_client_config" "default" {}
 
 provider "kubernetes" {
-  load_config_file       = false
   host                   = "https://${module.gke.endpoint}"
   token                  = data.google_client_config.default.access_token
   cluster_ca_certificate = base64decode(module.gke.ca_certificate)
diff --git a/examples/simple_regional_private_beta/main.tf b/examples/simple_regional_private_beta/main.tf
@@ -31,7 +31,6 @@ provider "google-beta" {
 data "google_client_config" "default" {}
 
 provider "kubernetes" {
-  load_config_file       = false
   host                   = "https://${module.gke.endpoint}"
   token                  = data.google_client_config.default.access_token
   cluster_ca_certificate = base64decode(module.gke.ca_certificate)
diff --git a/examples/simple_regional_with_kubeconfig/main.tf b/examples/simple_regional_with_kubeconfig/main.tf
@@ -26,7 +26,6 @@ provider "google" {
 data "google_client_config" "default" {}
 
 provider "kubernetes" {
-  load_config_file       = false
   host                   = "https://${module.gke.endpoint}"
   token                  = data.google_client_config.default.access_token
   cluster_ca_certificate = base64decode(module.gke.ca_certificate)
diff --git a/examples/simple_regional_with_networking/main.tf b/examples/simple_regional_with_networking/main.tf
@@ -21,7 +21,6 @@ provider "google" {
 data "google_client_config" "default" {}
 
 provider "kubernetes" {
-  load_config_file       = false
   host                   = "https://${module.gke.endpoint}"
   token                  = data.google_client_config.default.access_token
   cluster_ca_certificate = base64decode(module.gke.ca_certificate)
@@ -42,7 +41,7 @@ module "gcp-network" {
   ]
 
   secondary_ranges = {
-    "${var.subnetwork}" = [
+    (var.subnetwork) = [
       {
         range_name    = var.ip_range_pods_name
         ip_cidr_range = "192.168.0.0/18"
diff --git a/examples/simple_zonal_private/main.tf b/examples/simple_zonal_private/main.tf
@@ -26,7 +26,6 @@ provider "google" {
 data "google_client_config" "default" {}
 
 provider "kubernetes" {
-  load_config_file       = false
   host                   = "https://${module.gke.endpoint}"
   token                  = data.google_client_config.default.access_token
   cluster_ca_certificate = base64decode(module.gke.ca_certificate)
diff --git a/examples/simple_zonal_with_acm/main.tf b/examples/simple_zonal_with_acm/main.tf
@@ -26,7 +26,6 @@ provider "google" {
 data "google_client_config" "default" {}
 
 provider "kubernetes" {
-  load_config_file       = false
   host                   = "https://${module.gke.endpoint}"
   token                  = data.google_client_config.default.access_token
   cluster_ca_certificate = base64decode(module.gke.ca_certificate)
diff --git a/examples/simple_zonal_with_asm/main.tf b/examples/simple_zonal_with_asm/main.tf
@@ -31,7 +31,6 @@ provider "google" {
 data "google_client_config" "default" {}
 
 provider "kubernetes" {
-  load_config_file       = false
   host                   = "https://${module.gke.endpoint}"
   token                  = data.google_client_config.default.access_token
   cluster_ca_certificate = base64decode(module.gke.ca_certificate)
diff --git a/examples/simple_zonal_with_hub/main.tf b/examples/simple_zonal_with_hub/main.tf
@@ -26,7 +26,6 @@ provider "google" {
 data "google_client_config" "default" {}
 
 provider "kubernetes" {
-  load_config_file       = false
   host                   = "https://${module.gke.endpoint}"
   token                  = data.google_client_config.default.access_token
   cluster_ca_certificate = base64decode(module.gke.ca_certificate)
diff --git a/examples/stub_domains/main.tf b/examples/stub_domains/main.tf
@@ -26,7 +26,6 @@ provider "google" {
 data "google_client_config" "default" {}
 
 provider "kubernetes" {
-  load_config_file       = false
   host                   = "https://${module.gke.endpoint}"
   token                  = data.google_client_config.default.access_token
   cluster_ca_certificate = base64decode(module.gke.ca_certificate)
diff --git a/examples/stub_domains_private/main.tf b/examples/stub_domains_private/main.tf
@@ -22,7 +22,6 @@ provider "google" {
 data "google_client_config" "default" {}
 
 provider "kubernetes" {
-  load_config_file       = false
   host                   = "https://${module.gke.endpoint}"
   token                  = data.google_client_config.default.access_token
   cluster_ca_certificate = base64decode(module.gke.ca_certificate)
diff --git a/examples/stub_domains_upstream_nameservers/main.tf b/examples/stub_domains_upstream_nameservers/main.tf
@@ -26,7 +26,6 @@ provider "google" {
 data "google_client_config" "default" {}
 
 provider "kubernetes" {
-  load_config_file       = false
   host                   = "https://${module.gke.endpoint}"
   token                  = data.google_client_config.default.access_token
   cluster_ca_certificate = base64decode(module.gke.ca_certificate)
diff --git a/examples/upstream_nameservers/main.tf b/examples/upstream_nameservers/main.tf
@@ -26,7 +26,6 @@ provider "google" {
 data "google_client_config" "default" {}
 
 provider "kubernetes" {
-  load_config_file       = false
   host                   = "https://${module.gke.endpoint}"
   token                  = data.google_client_config.default.access_token
   cluster_ca_certificate = base64decode(module.gke.ca_certificate)
diff --git a/examples/workload_identity/main.tf b/examples/workload_identity/main.tf
@@ -26,7 +26,6 @@ provider "google" {
 data "google_client_config" "default" {}
 
 provider "kubernetes" {
-  load_config_file       = false
   host                   = "https://${module.gke.endpoint}"
   token                  = data.google_client_config.default.access_token
   cluster_ca_certificate = base64decode(module.gke.ca_certificate)
diff --git a/examples/workload_metadata_config/main.tf b/examples/workload_metadata_config/main.tf
@@ -26,7 +26,6 @@ provider "google-beta" {
 data "google_client_config" "default" {}
 
 provider "kubernetes" {
-  load_config_file       = false
   host                   = "https://${module.gke.endpoint}"
   token                  = data.google_client_config.default.access_token
   cluster_ca_certificate = base64decode(module.gke.ca_certificate)
diff --git a/modules/auth/README.md b/modules/auth/README.md
@@ -38,8 +38,6 @@ resource "local_file" "kubeconfig" {
 
 ```hcl
 provider "kubernetes" {
-  load_config_file = false
-
   cluster_ca_certificate = module.gke_auth.cluster_ca_certificate
   host                   = module.gke_auth.host
   token                  = module.gke_auth.token
diff --git a/modules/beta-private-cluster-update-variant/README.md b/modules/beta-private-cluster-update-variant/README.md
@@ -50,7 +50,6 @@ There are multiple examples included in the [examples](https://github.com/terraf
 data "google_client_config" "default" {}
 
 provider "kubernetes" {
-  load_config_file       = false
   host                   = "https://${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/versions.tf b/modules/beta-private-cluster-update-variant/versions.tf
@@ -25,7 +25,7 @@ terraform {
     }
     kubernetes = {
       source  = "hashicorp/kubernetes"
-      version = "~> 1.10, != 1.11.0"
+      version = "~> 2.0"
     }
   }
   provider_meta "google-beta" {
diff --git a/modules/beta-private-cluster/README.md b/modules/beta-private-cluster/README.md
@@ -28,7 +28,6 @@ There are multiple examples included in the [examples](https://github.com/terraf
 data "google_client_config" "default" {}
 
 provider "kubernetes" {
-  load_config_file       = false
   host                   = "https://${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/versions.tf b/modules/beta-private-cluster/versions.tf
@@ -25,7 +25,7 @@ terraform {
     }
     kubernetes = {
       source  = "hashicorp/kubernetes"
-      version = "~> 1.10, != 1.11.0"
+      version = "~> 2.0"
     }
   }
   provider_meta "google-beta" {
diff --git a/modules/beta-public-cluster-update-variant/README.md b/modules/beta-public-cluster-update-variant/README.md
@@ -47,7 +47,6 @@ There are multiple examples included in the [examples](https://github.com/terraf
 data "google_client_config" "default" {}
 
 provider "kubernetes" {
-  load_config_file       = false
   host                   = "https://${module.gke.endpoint}"
   token                  = data.google_client_config.default.access_token
   cluster_ca_certificate = base64decode(module.gke.ca_certificate)
diff --git a/modules/beta-public-cluster-update-variant/versions.tf b/modules/beta-public-cluster-update-variant/versions.tf
@@ -25,7 +25,7 @@ terraform {
     }
     kubernetes = {
       source  = "hashicorp/kubernetes"
-      version = "~> 1.10, != 1.11.0"
+      version = "~> 2.0"
     }
   }
   provider_meta "google-beta" {
diff --git a/modules/beta-public-cluster/README.md b/modules/beta-public-cluster/README.md
@@ -25,7 +25,6 @@ There are multiple examples included in the [examples](https://github.com/terraf
 data "google_client_config" "default" {}
 
 provider "kubernetes" {
-  load_config_file       = false
   host                   = "https://${module.gke.endpoint}"
   token                  = data.google_client_config.default.access_token
   cluster_ca_certificate = base64decode(module.gke.ca_certificate)
diff --git a/modules/beta-public-cluster/versions.tf b/modules/beta-public-cluster/versions.tf
@@ -25,7 +25,7 @@ terraform {
     }
     kubernetes = {
       source  = "hashicorp/kubernetes"
-      version = "~> 1.10, != 1.11.0"
+      version = "~> 2.0"
     }
   }
   provider_meta "google-beta" {
diff --git a/modules/private-cluster-update-variant/README.md b/modules/private-cluster-update-variant/README.md
@@ -50,7 +50,6 @@ There are multiple examples included in the [examples](https://github.com/terraf
 data "google_client_config" "default" {}
 
 provider "kubernetes" {
-  load_config_file       = false
   host                   = "https://${module.gke.endpoint}"
   token                  = data.google_client_config.default.access_token
   cluster_ca_certificate = base64decode(module.gke.ca_certificate)
diff --git a/modules/private-cluster-update-variant/versions.tf b/modules/private-cluster-update-variant/versions.tf
@@ -25,7 +25,7 @@ terraform {
     }
     kubernetes = {
       source  = "hashicorp/kubernetes"
-      version = "~> 1.10, != 1.11.0"
+      version = "~> 2.0"
     }
   }
   provider_meta "google" {
diff --git a/modules/private-cluster/README.md b/modules/private-cluster/README.md
@@ -28,7 +28,6 @@ There are multiple examples included in the [examples](https://github.com/terraf
 data "google_client_config" "default" {}
 
 provider "kubernetes" {
-  load_config_file       = false
   host                   = "https://${module.gke.endpoint}"
   token                  = data.google_client_config.default.access_token
   cluster_ca_certificate = base64decode(module.gke.ca_certificate)
diff --git a/modules/private-cluster/versions.tf b/modules/private-cluster/versions.tf
@@ -25,7 +25,7 @@ terraform {
     }
     kubernetes = {
       source  = "hashicorp/kubernetes"
-      version = "~> 1.10, != 1.11.0"
+      version = "~> 2.0"
     }
   }
   provider_meta "google" {
diff --git a/versions.tf b/versions.tf

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ terraform {`
`28`	`28`	`}`
`29`	`29`	`kubernetes = {`
`30`	`30`	`source = "hashicorp/kubernetes"`
`31`		`- version = "~> 1.10, != 1.11.0"`
	`31`	`+ version = "~> 2.0"`
`32`	`32`	`}`
`33`	`33`	`}`
`34`	`34`	`provider_meta "google-beta" {`
`@@ -42,7 +42,7 @@ terraform {`
`42`	`42`	`}`
`43`	`43`	`kubernetes = {`
`44`	`44`	`source = "hashicorp/kubernetes"`
`45`		`- version = "~> 1.10, != 1.11.0"`
	`45`	`+ version = "~> 2.0"`
`46`	`46`	`}`
`47`	`47`	`}`
`48`	`48`	`provider_meta "google" {`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,6 @@`
`17`	`17`	`data "google_client_config" "default" {}`
`18`	`18`
`19`	`19`	`provider "kubernetes" {`
`20`		`- load_config_file = false`
`21`	`20`	`host = "https://${module.gke.endpoint}"`
`22`	`21`	`token = data.google_client_config.default.access_token`
`23`	`22`	`cluster_ca_certificate = base64decode(module.gke.ca_certificate)`
`@@ -39,7 +38,7 @@ module "gcp-network" {`
`39`	`38`	`]`
`40`	`39`
`41`	`40`	`secondary_ranges = {`
`42`		`- "${var.subnetwork}" = [`
	`41`	`+ (var.subnetwork) = [`
`43`	`42`	`{`
`44`	`43`	`range_name = var.ip_range_pods_name`
`45`	`44`	`ip_cidr_range = "192.168.0.0/18"`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ module "gcp-network" {`
`34`	`34`	`]`
`35`	`35`
`36`	`36`	`secondary_ranges = {`
`37`		`- "${local.subnet_name}" = [`
	`37`	`+ (local.subnet_name) = [`
`38`	`38`	`{`
`39`	`39`	`range_name = local.pods_range_name`
`40`	`40`	`ip_cidr_range = "192.168.0.0/18"`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ module "vpc" {`
`33`	`33`	`}`
`34`	`34`	`]`
`35`	`35`	`secondary_ranges = {`
`36`		`- "${var.subnet_name}" = [`
	`36`	`+ (var.subnet_name) = [`
`37`	`37`	`{`
`38`	`38`	`range_name = var.ip_range_pods_name`
`39`	`39`	`ip_cidr_range = "192.168.0.0/18"`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,6 @@ provider "google" {`
`21`	`21`	`data "google_client_config" "default" {}`
`22`	`22`
`23`	`23`	`provider "kubernetes" {`
`24`		`- load_config_file = false`
`25`	`24`	`host = "https://${module.gke.endpoint}"`
`26`	`25`	`token = data.google_client_config.default.access_token`
`27`	`26`	`cluster_ca_certificate = base64decode(module.gke.ca_certificate)`
`@@ -42,7 +41,7 @@ module "gcp-network" {`
`42`	`41`	`]`
`43`	`42`
`44`	`43`	`secondary_ranges = {`
`45`		`- "${var.subnetwork}" = [`
	`44`	`+ (var.subnetwork) = [`
`46`	`45`	`{`
`47`	`46`	`range_name = var.ip_range_pods_name`
`48`	`47`	`ip_cidr_range = "192.168.0.0/18"`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ terraform {`
`25`	`25`	`}`
`26`	`26`	`kubernetes = {`
`27`	`27`	`source = "hashicorp/kubernetes"`
`28`		`- version = "~> 1.10, != 1.11.0"`
	`28`	`+ version = "~> 2.0"`
`29`	`29`	`}`
`30`	`30`	`}`
`31`	`31`	`provider_meta "google-beta" {`