From 9172b3eaeeb806caca29aa1e3e83e58a26df57b1 Mon Sep 17 00:00:00 2001 From: Paul Bonser Date: Mon, 17 May 2021 15:33:19 -0500 Subject: [PATCH] feat!: K8s provider upgrade (#892) * Update kubernetes provider to ~> 2.0 * Remove interpolation-only expressions to make docker_test_lint happy Co-authored-by: Bharath KKB --- README.md | 1 - autogen/main/README.md | 1 - autogen/main/versions.tf.tmpl | 4 ++-- 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/node_pool_update_variant_beta/main.tf | 1 - examples/node_pool_update_variant_public_beta/main.tf | 1 - examples/private_zonal_with_networking/main.tf | 3 +-- examples/regional_private_node_pool_oauth_scopes/provider.tf | 1 - examples/safer_cluster/main.tf | 1 - examples/safer_cluster/network.tf | 2 +- examples/safer_cluster_iap_bastion/network.tf | 2 +- examples/safer_cluster_iap_bastion/provider.tf | 1 - examples/shared_vpc/main.tf | 1 - examples/simple_regional/main.tf | 1 - examples/simple_regional_beta/main.tf | 1 - examples/simple_regional_private/main.tf | 1 - examples/simple_regional_private_beta/main.tf | 1 - examples/simple_regional_with_kubeconfig/main.tf | 1 - examples/simple_regional_with_networking/main.tf | 3 +-- examples/simple_zonal_private/main.tf | 1 - examples/simple_zonal_with_acm/main.tf | 1 - examples/simple_zonal_with_asm/main.tf | 1 - examples/simple_zonal_with_hub/main.tf | 1 - examples/stub_domains/main.tf | 1 - examples/stub_domains_private/main.tf | 1 - examples/stub_domains_upstream_nameservers/main.tf | 1 - examples/upstream_nameservers/main.tf | 1 - examples/workload_identity/main.tf | 1 - examples/workload_metadata_config/main.tf | 1 - modules/auth/README.md | 2 -- modules/beta-private-cluster-update-variant/README.md | 1 - modules/beta-private-cluster-update-variant/versions.tf | 2 +- modules/beta-private-cluster/README.md | 1 - modules/beta-private-cluster/versions.tf | 2 +- modules/beta-public-cluster-update-variant/README.md | 1 - modules/beta-public-cluster-update-variant/versions.tf | 2 +- modules/beta-public-cluster/README.md | 1 - modules/beta-public-cluster/versions.tf | 2 +- modules/private-cluster-update-variant/README.md | 1 - modules/private-cluster-update-variant/versions.tf | 2 +- modules/private-cluster/README.md | 1 - modules/private-cluster/versions.tf | 2 +- versions.tf | 2 +- 46 files changed, 13 insertions(+), 50 deletions(-) diff --git a/README.md b/README.md index af5273804..37ced0191 100644 --- 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 index 093f7e69b..f8c3a679b 100644 --- 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 index 4c8df98da..cc664712e 100644 --- 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 index 2d3df6336..c0b901d22 100644 --- 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 index 75866afe5..11bcb511f 100644 --- 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 index d06a1ead2..71b9501d5 100644 --- 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 index a41f3f5d8..9c4ab2339 100644 --- 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 index 3cf740b5a..f377cf5d4 100644 --- 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 index 80441be42..042e83299 100644 --- 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 index 605c651bb..a71dfaf76 100644 --- 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 index 4bf24c74b..05a66220a 100644 --- 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 index 8d9fd46cd..26f025f6c 100644 --- 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 index bf36d6f47..8b22071f0 100644 --- 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 index 00e23bdfe..e1986ad58 100644 --- 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 index 823e3a20b..0d3dfe9ff 100644 --- 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 index 0b308def7..bead5c938 100644 --- 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 index 55f05cdb8..e6d6f6ace 100644 --- 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 index e19598657..85f91cbb0 100644 --- 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 index 3da9ee210..3d88962f6 100644 --- 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 index 7fabdf906..919f76c3a 100644 --- 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 index edff6d9fc..433cac4d8 100644 --- 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 index 631411a96..a414e44f1 100644 --- 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 index c94cbef0e..be7a4ac20 100644 --- 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 index 9833941ca..09c0d320f 100644 --- 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 index 304301a1c..ab83e9222 100644 --- 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 index f6fc589c8..f14039842 100644 --- 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 index 1c1f38e29..f2829008f 100644 --- 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 index 0bf919248..1c240d2f4 100644 --- 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 index d0fe627a2..91b12d614 100644 --- 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 index 6dfd02afe..59e42fd4f 100644 --- 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 index 274a63033..02ba5c790 100644 --- 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 index c9d790939..350a5a560 100644 --- 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 index c98b2a468..486377459 100644 --- 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 index 322dd61a0..24a54fc62 100644 --- 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 index c9b3ab1cc..09032ed7d 100644 --- 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 index 4491df49c..0b3dcbe12 100644 --- 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 index e367f4e21..54caa2b51 100644 --- 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 index 339d449bc..5345cddf2 100644 --- 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 index afd9b6d19..8191e3c9f 100644 --- 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 index ab8fbe2d6..1f6750af0 100644 --- 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 index 78c3a767f..cce980bc6 100644 --- 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 index 0e4dbc4b9..367a4e688 100644 --- 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 index cd3cf70bd..93a24eadb 100644 --- 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 index 505a72a96..48453017f 100644 --- 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 index 9c0d5b4e0..106b92c18 100644 --- 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 index 763e726c7..b4391fba0 100644 --- a/versions.tf +++ b/versions.tf @@ -25,7 +25,7 @@ terraform { } kubernetes = { source = "hashicorp/kubernetes" - version = "~> 1.10, != 1.11.0" + version = "~> 2.0" } } provider_meta "google" {