From 38f72f9fb94f961bb7ea98e7d59423da15f36e8d Mon Sep 17 00:00:00 2001 From: psiegmannyardi <141450919+psiegmannyardi@users.noreply.github.com> Date: Wed, 12 Jun 2024 13:31:02 -0400 Subject: [PATCH 1/4] Update cluster.tf this currently sets enable_gcfs either to true or null which can cause node pools that are set to false to be recreated --- modules/private-cluster/cluster.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/private-cluster/cluster.tf b/modules/private-cluster/cluster.tf index 7f3f78766b..14019012a9 100644 --- a/modules/private-cluster/cluster.tf +++ b/modules/private-cluster/cluster.tf @@ -572,7 +572,7 @@ resource "google_container_node_pool" "pools" { machine_type = lookup(each.value, "machine_type", "e2-medium") min_cpu_platform = lookup(each.value, "min_cpu_platform", "") dynamic "gcfs_config" { - for_each = lookup(each.value, "enable_gcfs", false) ? [true] : [] + for_each = lookup(each.value, "enable_gcfs", false) ? [true] : [false] content { enabled = gcfs_config.value } From b90edde585d427c9e36f61d3c45b3f7d292f5450 Mon Sep 17 00:00:00 2001 From: psiegmannyardi Date: Thu, 13 Jun 2024 17:48:04 -0400 Subject: [PATCH 2/4] using autogen --- autogen/main/cluster.tf.tmpl | 4 ++-- cluster.tf | 6 +++--- .../acm-terraform-blog-part1/terraform/gke.tf | 4 ++-- .../acm-terraform-blog-part2/terraform/gke.tf | 4 ++-- .../acm-terraform-blog-part3/terraform/gke.tf | 8 ++++---- examples/deploy_service/main.tf | 4 ++-- examples/disable_client_cert/main.tf | 4 ++-- .../main.tf | 4 ++-- examples/island_cluster_with_vm_router/main.tf | 4 ++-- examples/node_pool/main.tf | 4 ++-- examples/node_pool_update_variant/main.tf | 4 ++-- examples/node_pool_update_variant_beta/main.tf | 4 ++-- .../node_pool_update_variant_public_beta/main.tf | 4 ++-- examples/private_zonal_with_networking/main.tf | 4 ++-- .../main.tf | 4 ++-- examples/safer_cluster/main.tf | 4 ++-- examples/safer_cluster_iap_bastion/cluster.tf | 4 ++-- examples/shared_vpc/main.tf | 4 ++-- examples/simple_autopilot_private/main.tf | 4 ++-- .../main.tf | 4 ++-- examples/simple_autopilot_public/main.tf | 4 ++-- examples/simple_regional/main.tf | 4 ++-- examples/simple_regional_beta/main.tf | 4 ++-- examples/simple_regional_private/main.tf | 4 ++-- examples/simple_regional_private_beta/main.tf | 4 ++-- .../main.tf | 4 ++-- .../simple_regional_with_gateway_api/main.tf | 4 ++-- examples/simple_regional_with_kubeconfig/main.tf | 8 ++++---- examples/simple_regional_with_networking/main.tf | 4 ++-- examples/simple_windows_node_pool/main.tf | 4 ++-- examples/simple_zonal_private/main.tf | 4 ++-- examples/simple_zonal_with_acm/acm.tf | 4 ++-- examples/simple_zonal_with_acm/main.tf | 4 ++-- examples/simple_zonal_with_asm/main.tf | 8 ++++---- examples/simple_zonal_with_hub/hub.tf | 4 ++-- examples/simple_zonal_with_hub/main.tf | 4 ++-- examples/simple_zonal_with_hub_kubeconfig/hub.tf | 4 ++-- examples/stub_domains/main.tf | 4 ++-- examples/stub_domains_private/main.tf | 4 ++-- .../stub_domains_upstream_nameservers/main.tf | 4 ++-- examples/upstream_nameservers/main.tf | 4 ++-- examples/workload_identity/main.tf | 16 ++++++++-------- examples/workload_metadata_config/main.tf | 4 ++-- .../cluster.tf | 6 +++--- modules/beta-private-cluster/cluster.tf | 6 +++--- .../cluster.tf | 6 +++--- modules/beta-public-cluster/cluster.tf | 6 +++--- .../private-cluster-update-variant/cluster.tf | 6 +++--- modules/private-cluster/cluster.tf | 4 ++-- 49 files changed, 116 insertions(+), 116 deletions(-) diff --git a/autogen/main/cluster.tf.tmpl b/autogen/main/cluster.tf.tmpl index ddeccb61ef..fd4dbbd4f9 100644 --- a/autogen/main/cluster.tf.tmpl +++ b/autogen/main/cluster.tf.tmpl @@ -482,7 +482,7 @@ resource "google_container_cluster" "primary" { machine_type = lookup(var.node_pools[0], "machine_type", "e2-medium") min_cpu_platform = lookup(var.node_pools[0], "min_cpu_platform", "") dynamic "gcfs_config" { - for_each = lookup(var.node_pools[0], "enable_gcfs", false) ? [true] : [] + for_each = lookup(var.node_pools[0], "enable_gcfs", false) ? [true] : [false] content { enabled = gcfs_config.value } @@ -831,7 +831,7 @@ resource "google_container_node_pool" "windows_pools" { machine_type = lookup(each.value, "machine_type", "e2-medium") min_cpu_platform = lookup(each.value, "min_cpu_platform", "") dynamic "gcfs_config" { - for_each = lookup(each.value, "enable_gcfs", false) ? [true] : [] + for_each = lookup(each.value, "enable_gcfs", false) ? [true] : [false] content { enabled = gcfs_config.value } diff --git a/cluster.tf b/cluster.tf index 7bb3a42d4e..0108b77419 100644 --- a/cluster.tf +++ b/cluster.tf @@ -361,7 +361,7 @@ resource "google_container_cluster" "primary" { machine_type = lookup(var.node_pools[0], "machine_type", "e2-medium") min_cpu_platform = lookup(var.node_pools[0], "min_cpu_platform", "") dynamic "gcfs_config" { - for_each = lookup(var.node_pools[0], "enable_gcfs", false) ? [true] : [] + for_each = lookup(var.node_pools[0], "enable_gcfs", false) ? [true] : [false] content { enabled = gcfs_config.value } @@ -553,7 +553,7 @@ resource "google_container_node_pool" "pools" { machine_type = lookup(each.value, "machine_type", "e2-medium") min_cpu_platform = lookup(each.value, "min_cpu_platform", "") dynamic "gcfs_config" { - for_each = lookup(each.value, "enable_gcfs", false) ? [true] : [] + for_each = lookup(each.value, "enable_gcfs", false) ? [true] : [false] content { enabled = gcfs_config.value } @@ -812,7 +812,7 @@ resource "google_container_node_pool" "windows_pools" { machine_type = lookup(each.value, "machine_type", "e2-medium") min_cpu_platform = lookup(each.value, "min_cpu_platform", "") dynamic "gcfs_config" { - for_each = lookup(each.value, "enable_gcfs", false) ? [true] : [] + for_each = lookup(each.value, "enable_gcfs", false) ? [true] : [false] content { enabled = gcfs_config.value } diff --git a/examples/acm-terraform-blog-part1/terraform/gke.tf b/examples/acm-terraform-blog-part1/terraform/gke.tf index 7df2197cfe..1dcbcbda55 100644 --- a/examples/acm-terraform-blog-part1/terraform/gke.tf +++ b/examples/acm-terraform-blog-part1/terraform/gke.tf @@ -30,8 +30,8 @@ module "enabled_google_apis" { } module "gke" { - source = "terraform-google-modules/kubernetes-engine/google" - version = "~> 31.0" + source = "../../.." + # [restore-marker] version = "~> 31.0" project_id = module.enabled_google_apis.project_id name = "sfl-acm-part1" region = var.region diff --git a/examples/acm-terraform-blog-part2/terraform/gke.tf b/examples/acm-terraform-blog-part2/terraform/gke.tf index 527d2ef100..55c129a170 100644 --- a/examples/acm-terraform-blog-part2/terraform/gke.tf +++ b/examples/acm-terraform-blog-part2/terraform/gke.tf @@ -30,8 +30,8 @@ module "enabled_google_apis" { } module "gke" { - source = "terraform-google-modules/kubernetes-engine/google" - version = "~> 31.0" + source = "../../.." + # [restore-marker] version = "~> 31.0" project_id = module.enabled_google_apis.project_id name = "sfl-acm-part2" region = var.region diff --git a/examples/acm-terraform-blog-part3/terraform/gke.tf b/examples/acm-terraform-blog-part3/terraform/gke.tf index ff4db070a5..eac681e4dc 100644 --- a/examples/acm-terraform-blog-part3/terraform/gke.tf +++ b/examples/acm-terraform-blog-part3/terraform/gke.tf @@ -32,8 +32,8 @@ module "enabled_google_apis" { } module "gke" { - source = "terraform-google-modules/kubernetes-engine/google//modules/beta-public-cluster" - version = "~> 31.0" + source = "../../../modules/beta-public-cluster" + # [restore-marker] version = "~> 31.0" project_id = module.enabled_google_apis.project_id name = "sfl-acm-part3" region = var.region @@ -47,8 +47,8 @@ module "gke" { } module "wi" { - source = "terraform-google-modules/kubernetes-engine/google//modules/workload-identity" - version = "~> 31.0" + source = "../../../modules/workload-identity" + # [restore-marker] version = "~> 31.0" gcp_sa_name = "cnrmsa" cluster_name = module.gke.name name = "cnrm-controller-manager" diff --git a/examples/deploy_service/main.tf b/examples/deploy_service/main.tf index 418cc61ed1..4bb620e7c0 100644 --- a/examples/deploy_service/main.tf +++ b/examples/deploy_service/main.tf @@ -27,8 +27,8 @@ provider "kubernetes" { } module "gke" { - source = "terraform-google-modules/kubernetes-engine/google" - version = "~> 31.0" + source = "../.." + # [restore-marker] version = "~> 31.0" project_id = var.project_id name = "${local.cluster_type}-cluster${var.cluster_name_suffix}" diff --git a/examples/disable_client_cert/main.tf b/examples/disable_client_cert/main.tf index 535d5200a1..1be35b2761 100644 --- a/examples/disable_client_cert/main.tf +++ b/examples/disable_client_cert/main.tf @@ -27,8 +27,8 @@ provider "kubernetes" { } module "gke" { - source = "terraform-google-modules/kubernetes-engine/google" - version = "~> 31.0" + source = "../.." + # [restore-marker] version = "~> 31.0" project_id = var.project_id name = "${local.cluster_type}-cluster${var.cluster_name_suffix}" diff --git a/examples/island_cluster_anywhere_in_gcp_design/main.tf b/examples/island_cluster_anywhere_in_gcp_design/main.tf index 8dbbe9894b..829135a4b1 100644 --- a/examples/island_cluster_anywhere_in_gcp_design/main.tf +++ b/examples/island_cluster_anywhere_in_gcp_design/main.tf @@ -26,8 +26,8 @@ resource "google_service_account" "gke-sa" { } module "gke" { - source = "terraform-google-modules/kubernetes-engine/google//modules/beta-private-cluster" - version = "~> 31.0" + source = "../../modules/beta-private-cluster" + # [restore-marker] version = "~> 31.0" for_each = { for k, v in var.gke_spokes : k => v } diff --git a/examples/island_cluster_with_vm_router/main.tf b/examples/island_cluster_with_vm_router/main.tf index 5984412ee5..16acdd1da7 100644 --- a/examples/island_cluster_with_vm_router/main.tf +++ b/examples/island_cluster_with_vm_router/main.tf @@ -142,8 +142,8 @@ module "net" { } module "gke" { - source = "terraform-google-modules/kubernetes-engine/google//modules/beta-private-cluster" - version = "~> 31.0" + source = "../../modules/beta-private-cluster" + # [restore-marker] version = "~> 31.0" depends_on = [google_compute_instance.vm] diff --git a/examples/node_pool/main.tf b/examples/node_pool/main.tf index 8da1827934..2160b29dbb 100644 --- a/examples/node_pool/main.tf +++ b/examples/node_pool/main.tf @@ -27,8 +27,8 @@ provider "kubernetes" { } module "gke" { - source = "terraform-google-modules/kubernetes-engine/google//modules/beta-public-cluster" - version = "~> 31.0" + source = "../../modules/beta-public-cluster" + # [restore-marker] version = "~> 31.0" project_id = var.project_id name = "${local.cluster_type}-cluster${var.cluster_name_suffix}" diff --git a/examples/node_pool_update_variant/main.tf b/examples/node_pool_update_variant/main.tf index b526e656bd..7260a82a68 100644 --- a/examples/node_pool_update_variant/main.tf +++ b/examples/node_pool_update_variant/main.tf @@ -33,8 +33,8 @@ provider "kubernetes" { } module "gke" { - source = "terraform-google-modules/kubernetes-engine/google//modules/private-cluster-update-variant" - version = "~> 31.0" + source = "../../modules/private-cluster-update-variant" + # [restore-marker] version = "~> 31.0" project_id = var.project_id name = "${local.cluster_type}-cluster${var.cluster_name_suffix}" diff --git a/examples/node_pool_update_variant_beta/main.tf b/examples/node_pool_update_variant_beta/main.tf index 99e9134518..c412f03263 100644 --- a/examples/node_pool_update_variant_beta/main.tf +++ b/examples/node_pool_update_variant_beta/main.tf @@ -38,8 +38,8 @@ provider "kubernetes" { } module "gke" { - source = "terraform-google-modules/kubernetes-engine/google//modules/beta-private-cluster-update-variant" - version = "~> 31.0" + source = "../../modules/beta-private-cluster-update-variant" + # [restore-marker] version = "~> 31.0" project_id = var.project_id name = "${local.cluster_type}-cluster${var.cluster_name_suffix}" diff --git a/examples/node_pool_update_variant_public_beta/main.tf b/examples/node_pool_update_variant_public_beta/main.tf index 4821df4ac6..b28ea44b6f 100644 --- a/examples/node_pool_update_variant_public_beta/main.tf +++ b/examples/node_pool_update_variant_public_beta/main.tf @@ -38,8 +38,8 @@ provider "kubernetes" { } module "gke" { - source = "terraform-google-modules/kubernetes-engine/google//modules/beta-public-cluster-update-variant" - version = "~> 31.0" + source = "../../modules/beta-public-cluster-update-variant" + # [restore-marker] version = "~> 31.0" project_id = var.project_id name = "${local.cluster_type}-cluster${var.cluster_name_suffix}" diff --git a/examples/private_zonal_with_networking/main.tf b/examples/private_zonal_with_networking/main.tf index 692a7bd1fd..3d92d407f8 100644 --- a/examples/private_zonal_with_networking/main.tf +++ b/examples/private_zonal_with_networking/main.tf @@ -60,8 +60,8 @@ data "google_compute_subnetwork" "subnetwork" { } module "gke" { - source = "terraform-google-modules/kubernetes-engine/google//modules/private-cluster" - version = "~> 31.0" + source = "../../modules/private-cluster" + # [restore-marker] version = "~> 31.0" project_id = var.project_id name = var.cluster_name diff --git a/examples/regional_private_node_pool_oauth_scopes/main.tf b/examples/regional_private_node_pool_oauth_scopes/main.tf index bf46331191..aa4c8c2afc 100644 --- a/examples/regional_private_node_pool_oauth_scopes/main.tf +++ b/examples/regional_private_node_pool_oauth_scopes/main.tf @@ -15,8 +15,8 @@ */ module "gke" { - source = "terraform-google-modules/kubernetes-engine/google//modules/private-cluster" - version = "~> 31.0" + source = "../../modules/private-cluster" + # [restore-marker] version = "~> 31.0" project_id = var.project_id name = "random-test-cluster" diff --git a/examples/safer_cluster/main.tf b/examples/safer_cluster/main.tf index 5d6df90110..52bbec6399 100644 --- a/examples/safer_cluster/main.tf +++ b/examples/safer_cluster/main.tf @@ -51,8 +51,8 @@ resource "random_shuffle" "version" { } module "gke" { - source = "terraform-google-modules/kubernetes-engine/google//modules/safer-cluster" - version = "~> 31.0" + source = "../../modules/safer-cluster" + # [restore-marker] version = "~> 31.0" project_id = var.project_id name = "${local.cluster_type}-cluster-${random_string.suffix.result}" diff --git a/examples/safer_cluster_iap_bastion/cluster.tf b/examples/safer_cluster_iap_bastion/cluster.tf index 8fbaa05646..f69193fde7 100644 --- a/examples/safer_cluster_iap_bastion/cluster.tf +++ b/examples/safer_cluster_iap_bastion/cluster.tf @@ -15,8 +15,8 @@ */ module "gke" { - source = "terraform-google-modules/kubernetes-engine/google//modules/safer-cluster" - version = "~> 31.0" + source = "../../modules/safer-cluster" + # [restore-marker] version = "~> 31.0" project_id = module.enabled_google_apis.project_id name = var.cluster_name diff --git a/examples/shared_vpc/main.tf b/examples/shared_vpc/main.tf index 5803a64c6f..d07952eaf3 100644 --- a/examples/shared_vpc/main.tf +++ b/examples/shared_vpc/main.tf @@ -27,8 +27,8 @@ provider "kubernetes" { } module "gke" { - source = "terraform-google-modules/kubernetes-engine/google" - version = "~> 31.0" + source = "../.." + # [restore-marker] version = "~> 31.0" project_id = var.project_id name = "${local.cluster_type}-cluster${var.cluster_name_suffix}" diff --git a/examples/simple_autopilot_private/main.tf b/examples/simple_autopilot_private/main.tf index d98f7f00df..168c7796fc 100644 --- a/examples/simple_autopilot_private/main.tf +++ b/examples/simple_autopilot_private/main.tf @@ -34,8 +34,8 @@ provider "kubernetes" { } module "gke" { - source = "terraform-google-modules/kubernetes-engine/google//modules/beta-autopilot-private-cluster" - version = "~> 31.0" + source = "../../modules/beta-autopilot-private-cluster" + # [restore-marker] version = "~> 31.0" project_id = var.project_id name = "${local.cluster_type}-cluster" diff --git a/examples/simple_autopilot_private_non_default_sa/main.tf b/examples/simple_autopilot_private_non_default_sa/main.tf index 332e41f1cc..1854aeee87 100644 --- a/examples/simple_autopilot_private_non_default_sa/main.tf +++ b/examples/simple_autopilot_private_non_default_sa/main.tf @@ -34,8 +34,8 @@ provider "kubernetes" { } module "gke" { - source = "terraform-google-modules/kubernetes-engine/google//modules/beta-autopilot-private-cluster" - version = "~> 31.0" + source = "../../modules/beta-autopilot-private-cluster" + # [restore-marker] version = "~> 31.0" project_id = var.project_id name = "${local.cluster_type}-cluster" diff --git a/examples/simple_autopilot_public/main.tf b/examples/simple_autopilot_public/main.tf index 451ef70317..64004162d2 100644 --- a/examples/simple_autopilot_public/main.tf +++ b/examples/simple_autopilot_public/main.tf @@ -33,8 +33,8 @@ provider "kubernetes" { } module "gke" { - source = "terraform-google-modules/kubernetes-engine/google//modules/beta-autopilot-public-cluster" - version = "~> 31.0" + source = "../../modules/beta-autopilot-public-cluster" + # [restore-marker] version = "~> 31.0" project_id = var.project_id name = "${local.cluster_type}-cluster" diff --git a/examples/simple_regional/main.tf b/examples/simple_regional/main.tf index 2127fa9eea..e81d4dc973 100644 --- a/examples/simple_regional/main.tf +++ b/examples/simple_regional/main.tf @@ -27,8 +27,8 @@ provider "kubernetes" { } module "gke" { - source = "terraform-google-modules/kubernetes-engine/google" - version = "~> 31.0" + source = "../.." + # [restore-marker] version = "~> 31.0" project_id = var.project_id name = "${local.cluster_type}-cluster${var.cluster_name_suffix}" diff --git a/examples/simple_regional_beta/main.tf b/examples/simple_regional_beta/main.tf index 2c1f082af9..3d67d5d95c 100644 --- a/examples/simple_regional_beta/main.tf +++ b/examples/simple_regional_beta/main.tf @@ -27,8 +27,8 @@ provider "kubernetes" { } module "gke" { - source = "terraform-google-modules/kubernetes-engine/google//modules/beta-public-cluster" - version = "~> 31.0" + source = "../../modules/beta-public-cluster" + # [restore-marker] version = "~> 31.0" project_id = var.project_id name = "${local.cluster_type}-cluster${var.cluster_name_suffix}" diff --git a/examples/simple_regional_private/main.tf b/examples/simple_regional_private/main.tf index 25cf124ef9..78ec5f7452 100644 --- a/examples/simple_regional_private/main.tf +++ b/examples/simple_regional_private/main.tf @@ -33,8 +33,8 @@ data "google_compute_subnetwork" "subnetwork" { } module "gke" { - source = "terraform-google-modules/kubernetes-engine/google//modules/private-cluster" - version = "~> 31.0" + source = "../../modules/private-cluster" + # [restore-marker] version = "~> 31.0" project_id = var.project_id name = "${local.cluster_type}-cluster${var.cluster_name_suffix}" diff --git a/examples/simple_regional_private_beta/main.tf b/examples/simple_regional_private_beta/main.tf index 822c7946ce..a6dae6e5d6 100644 --- a/examples/simple_regional_private_beta/main.tf +++ b/examples/simple_regional_private_beta/main.tf @@ -33,8 +33,8 @@ data "google_compute_subnetwork" "subnetwork" { } module "gke" { - source = "terraform-google-modules/kubernetes-engine/google//modules/beta-private-cluster" - version = "~> 31.0" + source = "../../modules/beta-private-cluster" + # [restore-marker] version = "~> 31.0" project_id = var.project_id name = "${local.cluster_type}-cluster${var.cluster_name_suffix}" diff --git a/examples/simple_regional_private_with_cluster_version/main.tf b/examples/simple_regional_private_with_cluster_version/main.tf index 23b5b83c99..f5d04c9566 100644 --- a/examples/simple_regional_private_with_cluster_version/main.tf +++ b/examples/simple_regional_private_with_cluster_version/main.tf @@ -33,8 +33,8 @@ data "google_compute_subnetwork" "subnetwork" { } module "gke" { - source = "terraform-google-modules/kubernetes-engine/google//modules/private-cluster" - version = "~> 31.0" + source = "../../modules/private-cluster" + # [restore-marker] version = "~> 31.0" project_id = var.project_id name = "${local.cluster_type}-cluster${var.cluster_name_suffix}" diff --git a/examples/simple_regional_with_gateway_api/main.tf b/examples/simple_regional_with_gateway_api/main.tf index 34500ada3a..7da90e684d 100644 --- a/examples/simple_regional_with_gateway_api/main.tf +++ b/examples/simple_regional_with_gateway_api/main.tf @@ -27,8 +27,8 @@ provider "kubernetes" { } module "gke" { - source = "terraform-google-modules/kubernetes-engine/google" - version = "~> 31.0" + source = "../.." + # [restore-marker] version = "~> 31.0" project_id = var.project_id name = "${local.cluster_type}-cluster${var.cluster_name_suffix}" diff --git a/examples/simple_regional_with_kubeconfig/main.tf b/examples/simple_regional_with_kubeconfig/main.tf index 7387bb0c15..ede6a1b55e 100644 --- a/examples/simple_regional_with_kubeconfig/main.tf +++ b/examples/simple_regional_with_kubeconfig/main.tf @@ -27,8 +27,8 @@ provider "kubernetes" { } module "gke" { - source = "terraform-google-modules/kubernetes-engine/google" - version = "~> 31.0" + source = "../.." + # [restore-marker] version = "~> 31.0" project_id = var.project_id name = "${local.cluster_type}-cluster${var.cluster_name_suffix}" @@ -44,8 +44,8 @@ module "gke" { } module "gke_auth" { - source = "terraform-google-modules/kubernetes-engine/google//modules/auth" - version = "~> 31.0" + source = "../../modules/auth" + # [restore-marker] version = "~> 31.0" project_id = var.project_id location = module.gke.location diff --git a/examples/simple_regional_with_networking/main.tf b/examples/simple_regional_with_networking/main.tf index a37c1fb6e9..9ddd45f029 100644 --- a/examples/simple_regional_with_networking/main.tf +++ b/examples/simple_regional_with_networking/main.tf @@ -52,8 +52,8 @@ module "gcp-network" { } module "gke" { - source = "terraform-google-modules/kubernetes-engine/google" - version = "~> 31.0" + source = "../.." + # [restore-marker] version = "~> 31.0" project_id = var.project_id name = var.cluster_name diff --git a/examples/simple_windows_node_pool/main.tf b/examples/simple_windows_node_pool/main.tf index 0562eea5a4..c3eeb7e1bf 100644 --- a/examples/simple_windows_node_pool/main.tf +++ b/examples/simple_windows_node_pool/main.tf @@ -27,8 +27,8 @@ provider "kubernetes" { } module "gke" { - source = "terraform-google-modules/kubernetes-engine/google//modules/beta-public-cluster" - version = "~> 31.0" + source = "../../modules/beta-public-cluster" + # [restore-marker] version = "~> 31.0" project_id = var.project_id regional = false diff --git a/examples/simple_zonal_private/main.tf b/examples/simple_zonal_private/main.tf index 138bfcd314..440e464ce9 100644 --- a/examples/simple_zonal_private/main.tf +++ b/examples/simple_zonal_private/main.tf @@ -33,8 +33,8 @@ data "google_compute_subnetwork" "subnetwork" { } module "gke" { - source = "terraform-google-modules/kubernetes-engine/google//modules/private-cluster" - version = "~> 31.0" + source = "../../modules/private-cluster" + # [restore-marker] version = "~> 31.0" project_id = var.project_id name = "${local.cluster_type}-cluster${var.cluster_name_suffix}" diff --git a/examples/simple_zonal_with_acm/acm.tf b/examples/simple_zonal_with_acm/acm.tf index 56d510cb89..b3ddeebf76 100644 --- a/examples/simple_zonal_with_acm/acm.tf +++ b/examples/simple_zonal_with_acm/acm.tf @@ -15,8 +15,8 @@ */ module "acm" { - source = "terraform-google-modules/kubernetes-engine/google//modules/acm" - version = "~> 31.0" + source = "../../modules/acm" + # [restore-marker] version = "~> 31.0" project_id = var.project_id location = module.gke.location diff --git a/examples/simple_zonal_with_acm/main.tf b/examples/simple_zonal_with_acm/main.tf index c62dc3b26b..1fda3bbc82 100644 --- a/examples/simple_zonal_with_acm/main.tf +++ b/examples/simple_zonal_with_acm/main.tf @@ -31,8 +31,8 @@ provider "kubernetes" { } module "gke" { - source = "terraform-google-modules/kubernetes-engine/google" - version = "~> 31.0" + source = "../.." + # [restore-marker] version = "~> 31.0" project_id = var.project_id regional = false diff --git a/examples/simple_zonal_with_asm/main.tf b/examples/simple_zonal_with_asm/main.tf index f54653b1ed..960cc2b821 100644 --- a/examples/simple_zonal_with_asm/main.tf +++ b/examples/simple_zonal_with_asm/main.tf @@ -27,8 +27,8 @@ data "google_project" "project" { } module "gke" { - source = "terraform-google-modules/kubernetes-engine/google" - version = "~> 31.0" + source = "../.." + # [restore-marker] version = "~> 31.0" project_id = var.project_id name = "test-prefix-cluster-test-suffix" @@ -56,8 +56,8 @@ module "gke" { } module "asm" { - source = "terraform-google-modules/kubernetes-engine/google//modules/asm" - version = "~> 31.0" + source = "../../modules/asm" + # [restore-marker] version = "~> 31.0" project_id = var.project_id cluster_name = module.gke.name diff --git a/examples/simple_zonal_with_hub/hub.tf b/examples/simple_zonal_with_hub/hub.tf index 5b7171ab4c..73a165dc66 100644 --- a/examples/simple_zonal_with_hub/hub.tf +++ b/examples/simple_zonal_with_hub/hub.tf @@ -15,8 +15,8 @@ */ module "hub" { - source = "terraform-google-modules/kubernetes-engine/google//modules/fleet-membership" - version = "~> 31.0" + source = "../../modules/fleet-membership" + # [restore-marker] version = "~> 31.0" project_id = var.project_id location = module.gke.location diff --git a/examples/simple_zonal_with_hub/main.tf b/examples/simple_zonal_with_hub/main.tf index 6c13cbdbbc..5fc8387529 100644 --- a/examples/simple_zonal_with_hub/main.tf +++ b/examples/simple_zonal_with_hub/main.tf @@ -27,8 +27,8 @@ provider "kubernetes" { } module "gke" { - source = "terraform-google-modules/kubernetes-engine/google" - version = "~> 31.0" + source = "../.." + # [restore-marker] version = "~> 31.0" project_id = var.project_id regional = false diff --git a/examples/simple_zonal_with_hub_kubeconfig/hub.tf b/examples/simple_zonal_with_hub_kubeconfig/hub.tf index d904d87c6b..074357b23e 100644 --- a/examples/simple_zonal_with_hub_kubeconfig/hub.tf +++ b/examples/simple_zonal_with_hub_kubeconfig/hub.tf @@ -15,8 +15,8 @@ */ module "hub" { - source = "terraform-google-modules/kubernetes-engine/google//modules/hub-legacy" - version = "~> 31.0" + source = "../../modules/hub-legacy" + # [restore-marker] version = "~> 31.0" project_id = var.project_id location = "remote" diff --git a/examples/stub_domains/main.tf b/examples/stub_domains/main.tf index 82599a7534..b41b106127 100644 --- a/examples/stub_domains/main.tf +++ b/examples/stub_domains/main.tf @@ -27,8 +27,8 @@ provider "kubernetes" { } module "gke" { - source = "terraform-google-modules/kubernetes-engine/google" - version = "~> 31.0" + source = "../.." + # [restore-marker] version = "~> 31.0" project_id = var.project_id name = "${local.cluster_type}-cluster${var.cluster_name_suffix}" diff --git a/examples/stub_domains_private/main.tf b/examples/stub_domains_private/main.tf index 5bb6268ffc..e2bdaded3c 100644 --- a/examples/stub_domains_private/main.tf +++ b/examples/stub_domains_private/main.tf @@ -29,8 +29,8 @@ data "google_compute_subnetwork" "subnetwork" { } module "gke" { - source = "terraform-google-modules/kubernetes-engine/google//modules/private-cluster" - version = "~> 31.0" + source = "../../modules/private-cluster" + # [restore-marker] version = "~> 31.0" ip_range_pods = var.ip_range_pods ip_range_services = var.ip_range_services diff --git a/examples/stub_domains_upstream_nameservers/main.tf b/examples/stub_domains_upstream_nameservers/main.tf index 5a95ab8e69..2a867aa3fb 100644 --- a/examples/stub_domains_upstream_nameservers/main.tf +++ b/examples/stub_domains_upstream_nameservers/main.tf @@ -27,8 +27,8 @@ provider "kubernetes" { } module "gke" { - source = "terraform-google-modules/kubernetes-engine/google" - version = "~> 31.0" + source = "../.." + # [restore-marker] version = "~> 31.0" project_id = var.project_id name = "${local.cluster_type}-cluster${var.cluster_name_suffix}" diff --git a/examples/upstream_nameservers/main.tf b/examples/upstream_nameservers/main.tf index 876152ad28..087a90c4a0 100644 --- a/examples/upstream_nameservers/main.tf +++ b/examples/upstream_nameservers/main.tf @@ -27,8 +27,8 @@ provider "kubernetes" { } module "gke" { - source = "terraform-google-modules/kubernetes-engine/google" - version = "~> 31.0" + source = "../.." + # [restore-marker] version = "~> 31.0" project_id = var.project_id name = "${local.cluster_type}-cluster${var.cluster_name_suffix}" diff --git a/examples/workload_identity/main.tf b/examples/workload_identity/main.tf index 98b406e31b..432723935a 100644 --- a/examples/workload_identity/main.tf +++ b/examples/workload_identity/main.tf @@ -27,8 +27,8 @@ provider "kubernetes" { } module "gke" { - source = "terraform-google-modules/kubernetes-engine/google" - version = "~> 31.0" + source = "../.." + # [restore-marker] version = "~> 31.0" project_id = var.project_id name = "${local.cluster_type}-cluster${var.cluster_name_suffix}" @@ -53,8 +53,8 @@ module "gke" { # example without existing KSA module "workload_identity" { - source = "terraform-google-modules/kubernetes-engine/google//modules/workload-identity" - version = "~> 31.0" + source = "../../modules/workload-identity" + # [restore-marker] version = "~> 31.0" project_id = var.project_id name = "iden-${module.gke.name}" @@ -73,8 +73,8 @@ resource "kubernetes_service_account" "test" { } module "workload_identity_existing_ksa" { - source = "terraform-google-modules/kubernetes-engine/google//modules/workload-identity" - version = "~> 31.0" + source = "../../modules/workload-identity" + # [restore-marker] version = "~> 31.0" project_id = var.project_id name = "existing-${module.gke.name}" @@ -92,8 +92,8 @@ resource "google_service_account" "custom" { } module "workload_identity_existing_gsa" { - source = "terraform-google-modules/kubernetes-engine/google//modules/workload-identity" - version = "~> 31.0" + source = "../../modules/workload-identity" + # [restore-marker] version = "~> 31.0" project_id = var.project_id name = google_service_account.custom.account_id diff --git a/examples/workload_metadata_config/main.tf b/examples/workload_metadata_config/main.tf index 4ee285814d..c1f522a768 100644 --- a/examples/workload_metadata_config/main.tf +++ b/examples/workload_metadata_config/main.tf @@ -33,8 +33,8 @@ data "google_compute_subnetwork" "subnetwork" { } module "gke" { - source = "terraform-google-modules/kubernetes-engine/google//modules/private-cluster" - version = "~> 31.0" + source = "../../modules/private-cluster" + # [restore-marker] version = "~> 31.0" project_id = var.project_id name = "${local.cluster_type}-cluster${var.cluster_name_suffix}" diff --git a/modules/beta-private-cluster-update-variant/cluster.tf b/modules/beta-private-cluster-update-variant/cluster.tf index cef54d371d..c20212510f 100644 --- a/modules/beta-private-cluster-update-variant/cluster.tf +++ b/modules/beta-private-cluster-update-variant/cluster.tf @@ -409,7 +409,7 @@ resource "google_container_cluster" "primary" { machine_type = lookup(var.node_pools[0], "machine_type", "e2-medium") min_cpu_platform = lookup(var.node_pools[0], "min_cpu_platform", "") dynamic "gcfs_config" { - for_each = lookup(var.node_pools[0], "enable_gcfs", false) ? [true] : [] + for_each = lookup(var.node_pools[0], "enable_gcfs", false) ? [true] : [false] content { enabled = gcfs_config.value } @@ -717,7 +717,7 @@ resource "google_container_node_pool" "pools" { machine_type = lookup(each.value, "machine_type", "e2-medium") min_cpu_platform = lookup(each.value, "min_cpu_platform", "") dynamic "gcfs_config" { - for_each = lookup(each.value, "enable_gcfs", false) ? [true] : [] + for_each = lookup(each.value, "enable_gcfs", false) ? [true] : [false] content { enabled = gcfs_config.value } @@ -1003,7 +1003,7 @@ resource "google_container_node_pool" "windows_pools" { machine_type = lookup(each.value, "machine_type", "e2-medium") min_cpu_platform = lookup(each.value, "min_cpu_platform", "") dynamic "gcfs_config" { - for_each = lookup(each.value, "enable_gcfs", false) ? [true] : [] + for_each = lookup(each.value, "enable_gcfs", false) ? [true] : [false] content { enabled = gcfs_config.value } diff --git a/modules/beta-private-cluster/cluster.tf b/modules/beta-private-cluster/cluster.tf index 5fbe49a699..75e6681854 100644 --- a/modules/beta-private-cluster/cluster.tf +++ b/modules/beta-private-cluster/cluster.tf @@ -409,7 +409,7 @@ resource "google_container_cluster" "primary" { machine_type = lookup(var.node_pools[0], "machine_type", "e2-medium") min_cpu_platform = lookup(var.node_pools[0], "min_cpu_platform", "") dynamic "gcfs_config" { - for_each = lookup(var.node_pools[0], "enable_gcfs", false) ? [true] : [] + for_each = lookup(var.node_pools[0], "enable_gcfs", false) ? [true] : [false] content { enabled = gcfs_config.value } @@ -638,7 +638,7 @@ resource "google_container_node_pool" "pools" { machine_type = lookup(each.value, "machine_type", "e2-medium") min_cpu_platform = lookup(each.value, "min_cpu_platform", "") dynamic "gcfs_config" { - for_each = lookup(each.value, "enable_gcfs", false) ? [true] : [] + for_each = lookup(each.value, "enable_gcfs", false) ? [true] : [false] content { enabled = gcfs_config.value } @@ -923,7 +923,7 @@ resource "google_container_node_pool" "windows_pools" { machine_type = lookup(each.value, "machine_type", "e2-medium") min_cpu_platform = lookup(each.value, "min_cpu_platform", "") dynamic "gcfs_config" { - for_each = lookup(each.value, "enable_gcfs", false) ? [true] : [] + for_each = lookup(each.value, "enable_gcfs", false) ? [true] : [false] content { enabled = gcfs_config.value } diff --git a/modules/beta-public-cluster-update-variant/cluster.tf b/modules/beta-public-cluster-update-variant/cluster.tf index 9795922e4f..bdd6e09699 100644 --- a/modules/beta-public-cluster-update-variant/cluster.tf +++ b/modules/beta-public-cluster-update-variant/cluster.tf @@ -409,7 +409,7 @@ resource "google_container_cluster" "primary" { machine_type = lookup(var.node_pools[0], "machine_type", "e2-medium") min_cpu_platform = lookup(var.node_pools[0], "min_cpu_platform", "") dynamic "gcfs_config" { - for_each = lookup(var.node_pools[0], "enable_gcfs", false) ? [true] : [] + for_each = lookup(var.node_pools[0], "enable_gcfs", false) ? [true] : [false] content { enabled = gcfs_config.value } @@ -698,7 +698,7 @@ resource "google_container_node_pool" "pools" { machine_type = lookup(each.value, "machine_type", "e2-medium") min_cpu_platform = lookup(each.value, "min_cpu_platform", "") dynamic "gcfs_config" { - for_each = lookup(each.value, "enable_gcfs", false) ? [true] : [] + for_each = lookup(each.value, "enable_gcfs", false) ? [true] : [false] content { enabled = gcfs_config.value } @@ -984,7 +984,7 @@ resource "google_container_node_pool" "windows_pools" { machine_type = lookup(each.value, "machine_type", "e2-medium") min_cpu_platform = lookup(each.value, "min_cpu_platform", "") dynamic "gcfs_config" { - for_each = lookup(each.value, "enable_gcfs", false) ? [true] : [] + for_each = lookup(each.value, "enable_gcfs", false) ? [true] : [false] content { enabled = gcfs_config.value } diff --git a/modules/beta-public-cluster/cluster.tf b/modules/beta-public-cluster/cluster.tf index 73dad2ee55..5aab7874d2 100644 --- a/modules/beta-public-cluster/cluster.tf +++ b/modules/beta-public-cluster/cluster.tf @@ -409,7 +409,7 @@ resource "google_container_cluster" "primary" { machine_type = lookup(var.node_pools[0], "machine_type", "e2-medium") min_cpu_platform = lookup(var.node_pools[0], "min_cpu_platform", "") dynamic "gcfs_config" { - for_each = lookup(var.node_pools[0], "enable_gcfs", false) ? [true] : [] + for_each = lookup(var.node_pools[0], "enable_gcfs", false) ? [true] : [false] content { enabled = gcfs_config.value } @@ -619,7 +619,7 @@ resource "google_container_node_pool" "pools" { machine_type = lookup(each.value, "machine_type", "e2-medium") min_cpu_platform = lookup(each.value, "min_cpu_platform", "") dynamic "gcfs_config" { - for_each = lookup(each.value, "enable_gcfs", false) ? [true] : [] + for_each = lookup(each.value, "enable_gcfs", false) ? [true] : [false] content { enabled = gcfs_config.value } @@ -904,7 +904,7 @@ resource "google_container_node_pool" "windows_pools" { machine_type = lookup(each.value, "machine_type", "e2-medium") min_cpu_platform = lookup(each.value, "min_cpu_platform", "") dynamic "gcfs_config" { - for_each = lookup(each.value, "enable_gcfs", false) ? [true] : [] + for_each = lookup(each.value, "enable_gcfs", false) ? [true] : [false] content { enabled = gcfs_config.value } diff --git a/modules/private-cluster-update-variant/cluster.tf b/modules/private-cluster-update-variant/cluster.tf index a6bff1de29..c4051fcd2e 100644 --- a/modules/private-cluster-update-variant/cluster.tf +++ b/modules/private-cluster-update-variant/cluster.tf @@ -361,7 +361,7 @@ resource "google_container_cluster" "primary" { machine_type = lookup(var.node_pools[0], "machine_type", "e2-medium") min_cpu_platform = lookup(var.node_pools[0], "min_cpu_platform", "") dynamic "gcfs_config" { - for_each = lookup(var.node_pools[0], "enable_gcfs", false) ? [true] : [] + for_each = lookup(var.node_pools[0], "enable_gcfs", false) ? [true] : [false] content { enabled = gcfs_config.value } @@ -651,7 +651,7 @@ resource "google_container_node_pool" "pools" { machine_type = lookup(each.value, "machine_type", "e2-medium") min_cpu_platform = lookup(each.value, "min_cpu_platform", "") dynamic "gcfs_config" { - for_each = lookup(each.value, "enable_gcfs", false) ? [true] : [] + for_each = lookup(each.value, "enable_gcfs", false) ? [true] : [false] content { enabled = gcfs_config.value } @@ -911,7 +911,7 @@ resource "google_container_node_pool" "windows_pools" { machine_type = lookup(each.value, "machine_type", "e2-medium") min_cpu_platform = lookup(each.value, "min_cpu_platform", "") dynamic "gcfs_config" { - for_each = lookup(each.value, "enable_gcfs", false) ? [true] : [] + for_each = lookup(each.value, "enable_gcfs", false) ? [true] : [false] content { enabled = gcfs_config.value } diff --git a/modules/private-cluster/cluster.tf b/modules/private-cluster/cluster.tf index 14019012a9..529e01151f 100644 --- a/modules/private-cluster/cluster.tf +++ b/modules/private-cluster/cluster.tf @@ -361,7 +361,7 @@ resource "google_container_cluster" "primary" { machine_type = lookup(var.node_pools[0], "machine_type", "e2-medium") min_cpu_platform = lookup(var.node_pools[0], "min_cpu_platform", "") dynamic "gcfs_config" { - for_each = lookup(var.node_pools[0], "enable_gcfs", false) ? [true] : [] + for_each = lookup(var.node_pools[0], "enable_gcfs", false) ? [true] : [false] content { enabled = gcfs_config.value } @@ -831,7 +831,7 @@ resource "google_container_node_pool" "windows_pools" { machine_type = lookup(each.value, "machine_type", "e2-medium") min_cpu_platform = lookup(each.value, "min_cpu_platform", "") dynamic "gcfs_config" { - for_each = lookup(each.value, "enable_gcfs", false) ? [true] : [] + for_each = lookup(each.value, "enable_gcfs", false) ? [true] : [false] content { enabled = gcfs_config.value } From ecbb3b7f466e02f38b55087e2fd093ecc9a0e366 Mon Sep 17 00:00:00 2001 From: psiegmannyardi Date: Tue, 25 Jun 2024 13:47:17 -0400 Subject: [PATCH 3/4] revert examples --- .../acm-terraform-blog-part1/terraform/gke.tf | 4 ++-- .../acm-terraform-blog-part2/terraform/gke.tf | 4 ++-- .../acm-terraform-blog-part3/terraform/gke.tf | 8 ++++---- examples/deploy_service/main.tf | 4 ++-- examples/disable_client_cert/main.tf | 4 ++-- .../main.tf | 4 ++-- examples/island_cluster_with_vm_router/main.tf | 4 ++-- examples/node_pool/main.tf | 4 ++-- examples/node_pool_update_variant/main.tf | 4 ++-- examples/node_pool_update_variant_beta/main.tf | 4 ++-- .../node_pool_update_variant_public_beta/main.tf | 4 ++-- examples/private_zonal_with_networking/main.tf | 4 ++-- .../main.tf | 4 ++-- examples/safer_cluster/main.tf | 4 ++-- examples/safer_cluster_iap_bastion/cluster.tf | 4 ++-- examples/shared_vpc/main.tf | 4 ++-- examples/simple_autopilot_private/main.tf | 4 ++-- .../main.tf | 4 ++-- examples/simple_autopilot_public/main.tf | 4 ++-- examples/simple_regional/main.tf | 4 ++-- examples/simple_regional_beta/main.tf | 4 ++-- examples/simple_regional_private/main.tf | 4 ++-- examples/simple_regional_private_beta/main.tf | 4 ++-- .../main.tf | 4 ++-- .../simple_regional_with_gateway_api/main.tf | 4 ++-- examples/simple_regional_with_ipv6/main.tf | 2 +- examples/simple_regional_with_kubeconfig/main.tf | 8 ++++---- examples/simple_regional_with_networking/main.tf | 4 ++-- examples/simple_windows_node_pool/main.tf | 4 ++-- examples/simple_zonal_private/main.tf | 4 ++-- examples/simple_zonal_with_acm/acm.tf | 4 ++-- examples/simple_zonal_with_acm/main.tf | 4 ++-- examples/simple_zonal_with_asm/main.tf | 8 ++++---- examples/simple_zonal_with_hub/hub.tf | 4 ++-- examples/simple_zonal_with_hub/main.tf | 4 ++-- examples/simple_zonal_with_hub_kubeconfig/hub.tf | 4 ++-- examples/stub_domains/main.tf | 4 ++-- examples/stub_domains_private/main.tf | 4 ++-- .../stub_domains_upstream_nameservers/main.tf | 4 ++-- examples/upstream_nameservers/main.tf | 4 ++-- examples/workload_identity/main.tf | 16 ++++++++-------- examples/workload_metadata_config/main.tf | 4 ++-- 42 files changed, 95 insertions(+), 95 deletions(-) diff --git a/examples/acm-terraform-blog-part1/terraform/gke.tf b/examples/acm-terraform-blog-part1/terraform/gke.tf index 1dcbcbda55..7df2197cfe 100644 --- a/examples/acm-terraform-blog-part1/terraform/gke.tf +++ b/examples/acm-terraform-blog-part1/terraform/gke.tf @@ -30,8 +30,8 @@ module "enabled_google_apis" { } module "gke" { - source = "../../.." - # [restore-marker] version = "~> 31.0" + source = "terraform-google-modules/kubernetes-engine/google" + version = "~> 31.0" project_id = module.enabled_google_apis.project_id name = "sfl-acm-part1" region = var.region diff --git a/examples/acm-terraform-blog-part2/terraform/gke.tf b/examples/acm-terraform-blog-part2/terraform/gke.tf index 55c129a170..527d2ef100 100644 --- a/examples/acm-terraform-blog-part2/terraform/gke.tf +++ b/examples/acm-terraform-blog-part2/terraform/gke.tf @@ -30,8 +30,8 @@ module "enabled_google_apis" { } module "gke" { - source = "../../.." - # [restore-marker] version = "~> 31.0" + source = "terraform-google-modules/kubernetes-engine/google" + version = "~> 31.0" project_id = module.enabled_google_apis.project_id name = "sfl-acm-part2" region = var.region diff --git a/examples/acm-terraform-blog-part3/terraform/gke.tf b/examples/acm-terraform-blog-part3/terraform/gke.tf index eac681e4dc..ff4db070a5 100644 --- a/examples/acm-terraform-blog-part3/terraform/gke.tf +++ b/examples/acm-terraform-blog-part3/terraform/gke.tf @@ -32,8 +32,8 @@ module "enabled_google_apis" { } module "gke" { - source = "../../../modules/beta-public-cluster" - # [restore-marker] version = "~> 31.0" + source = "terraform-google-modules/kubernetes-engine/google//modules/beta-public-cluster" + version = "~> 31.0" project_id = module.enabled_google_apis.project_id name = "sfl-acm-part3" region = var.region @@ -47,8 +47,8 @@ module "gke" { } module "wi" { - source = "../../../modules/workload-identity" - # [restore-marker] version = "~> 31.0" + source = "terraform-google-modules/kubernetes-engine/google//modules/workload-identity" + version = "~> 31.0" gcp_sa_name = "cnrmsa" cluster_name = module.gke.name name = "cnrm-controller-manager" diff --git a/examples/deploy_service/main.tf b/examples/deploy_service/main.tf index 4bb620e7c0..418cc61ed1 100644 --- a/examples/deploy_service/main.tf +++ b/examples/deploy_service/main.tf @@ -27,8 +27,8 @@ provider "kubernetes" { } module "gke" { - source = "../.." - # [restore-marker] version = "~> 31.0" + source = "terraform-google-modules/kubernetes-engine/google" + version = "~> 31.0" project_id = var.project_id name = "${local.cluster_type}-cluster${var.cluster_name_suffix}" diff --git a/examples/disable_client_cert/main.tf b/examples/disable_client_cert/main.tf index 1be35b2761..535d5200a1 100644 --- a/examples/disable_client_cert/main.tf +++ b/examples/disable_client_cert/main.tf @@ -27,8 +27,8 @@ provider "kubernetes" { } module "gke" { - source = "../.." - # [restore-marker] version = "~> 31.0" + source = "terraform-google-modules/kubernetes-engine/google" + version = "~> 31.0" project_id = var.project_id name = "${local.cluster_type}-cluster${var.cluster_name_suffix}" diff --git a/examples/island_cluster_anywhere_in_gcp_design/main.tf b/examples/island_cluster_anywhere_in_gcp_design/main.tf index 829135a4b1..8dbbe9894b 100644 --- a/examples/island_cluster_anywhere_in_gcp_design/main.tf +++ b/examples/island_cluster_anywhere_in_gcp_design/main.tf @@ -26,8 +26,8 @@ resource "google_service_account" "gke-sa" { } module "gke" { - source = "../../modules/beta-private-cluster" - # [restore-marker] version = "~> 31.0" + source = "terraform-google-modules/kubernetes-engine/google//modules/beta-private-cluster" + version = "~> 31.0" for_each = { for k, v in var.gke_spokes : k => v } diff --git a/examples/island_cluster_with_vm_router/main.tf b/examples/island_cluster_with_vm_router/main.tf index 16acdd1da7..5984412ee5 100644 --- a/examples/island_cluster_with_vm_router/main.tf +++ b/examples/island_cluster_with_vm_router/main.tf @@ -142,8 +142,8 @@ module "net" { } module "gke" { - source = "../../modules/beta-private-cluster" - # [restore-marker] version = "~> 31.0" + source = "terraform-google-modules/kubernetes-engine/google//modules/beta-private-cluster" + version = "~> 31.0" depends_on = [google_compute_instance.vm] diff --git a/examples/node_pool/main.tf b/examples/node_pool/main.tf index 2160b29dbb..8da1827934 100644 --- a/examples/node_pool/main.tf +++ b/examples/node_pool/main.tf @@ -27,8 +27,8 @@ provider "kubernetes" { } module "gke" { - source = "../../modules/beta-public-cluster" - # [restore-marker] version = "~> 31.0" + source = "terraform-google-modules/kubernetes-engine/google//modules/beta-public-cluster" + version = "~> 31.0" project_id = var.project_id name = "${local.cluster_type}-cluster${var.cluster_name_suffix}" diff --git a/examples/node_pool_update_variant/main.tf b/examples/node_pool_update_variant/main.tf index 7260a82a68..b526e656bd 100644 --- a/examples/node_pool_update_variant/main.tf +++ b/examples/node_pool_update_variant/main.tf @@ -33,8 +33,8 @@ provider "kubernetes" { } module "gke" { - source = "../../modules/private-cluster-update-variant" - # [restore-marker] version = "~> 31.0" + source = "terraform-google-modules/kubernetes-engine/google//modules/private-cluster-update-variant" + version = "~> 31.0" project_id = var.project_id name = "${local.cluster_type}-cluster${var.cluster_name_suffix}" diff --git a/examples/node_pool_update_variant_beta/main.tf b/examples/node_pool_update_variant_beta/main.tf index c412f03263..99e9134518 100644 --- a/examples/node_pool_update_variant_beta/main.tf +++ b/examples/node_pool_update_variant_beta/main.tf @@ -38,8 +38,8 @@ provider "kubernetes" { } module "gke" { - source = "../../modules/beta-private-cluster-update-variant" - # [restore-marker] version = "~> 31.0" + source = "terraform-google-modules/kubernetes-engine/google//modules/beta-private-cluster-update-variant" + version = "~> 31.0" project_id = var.project_id name = "${local.cluster_type}-cluster${var.cluster_name_suffix}" diff --git a/examples/node_pool_update_variant_public_beta/main.tf b/examples/node_pool_update_variant_public_beta/main.tf index b28ea44b6f..4821df4ac6 100644 --- a/examples/node_pool_update_variant_public_beta/main.tf +++ b/examples/node_pool_update_variant_public_beta/main.tf @@ -38,8 +38,8 @@ provider "kubernetes" { } module "gke" { - source = "../../modules/beta-public-cluster-update-variant" - # [restore-marker] version = "~> 31.0" + source = "terraform-google-modules/kubernetes-engine/google//modules/beta-public-cluster-update-variant" + version = "~> 31.0" project_id = var.project_id name = "${local.cluster_type}-cluster${var.cluster_name_suffix}" diff --git a/examples/private_zonal_with_networking/main.tf b/examples/private_zonal_with_networking/main.tf index 3d92d407f8..692a7bd1fd 100644 --- a/examples/private_zonal_with_networking/main.tf +++ b/examples/private_zonal_with_networking/main.tf @@ -60,8 +60,8 @@ data "google_compute_subnetwork" "subnetwork" { } module "gke" { - source = "../../modules/private-cluster" - # [restore-marker] version = "~> 31.0" + source = "terraform-google-modules/kubernetes-engine/google//modules/private-cluster" + version = "~> 31.0" project_id = var.project_id name = var.cluster_name diff --git a/examples/regional_private_node_pool_oauth_scopes/main.tf b/examples/regional_private_node_pool_oauth_scopes/main.tf index aa4c8c2afc..bf46331191 100644 --- a/examples/regional_private_node_pool_oauth_scopes/main.tf +++ b/examples/regional_private_node_pool_oauth_scopes/main.tf @@ -15,8 +15,8 @@ */ module "gke" { - source = "../../modules/private-cluster" - # [restore-marker] version = "~> 31.0" + source = "terraform-google-modules/kubernetes-engine/google//modules/private-cluster" + version = "~> 31.0" project_id = var.project_id name = "random-test-cluster" diff --git a/examples/safer_cluster/main.tf b/examples/safer_cluster/main.tf index 52bbec6399..5d6df90110 100644 --- a/examples/safer_cluster/main.tf +++ b/examples/safer_cluster/main.tf @@ -51,8 +51,8 @@ resource "random_shuffle" "version" { } module "gke" { - source = "../../modules/safer-cluster" - # [restore-marker] version = "~> 31.0" + source = "terraform-google-modules/kubernetes-engine/google//modules/safer-cluster" + version = "~> 31.0" project_id = var.project_id name = "${local.cluster_type}-cluster-${random_string.suffix.result}" diff --git a/examples/safer_cluster_iap_bastion/cluster.tf b/examples/safer_cluster_iap_bastion/cluster.tf index f69193fde7..8fbaa05646 100644 --- a/examples/safer_cluster_iap_bastion/cluster.tf +++ b/examples/safer_cluster_iap_bastion/cluster.tf @@ -15,8 +15,8 @@ */ module "gke" { - source = "../../modules/safer-cluster" - # [restore-marker] version = "~> 31.0" + source = "terraform-google-modules/kubernetes-engine/google//modules/safer-cluster" + version = "~> 31.0" project_id = module.enabled_google_apis.project_id name = var.cluster_name diff --git a/examples/shared_vpc/main.tf b/examples/shared_vpc/main.tf index d07952eaf3..5803a64c6f 100644 --- a/examples/shared_vpc/main.tf +++ b/examples/shared_vpc/main.tf @@ -27,8 +27,8 @@ provider "kubernetes" { } module "gke" { - source = "../.." - # [restore-marker] version = "~> 31.0" + source = "terraform-google-modules/kubernetes-engine/google" + version = "~> 31.0" project_id = var.project_id name = "${local.cluster_type}-cluster${var.cluster_name_suffix}" diff --git a/examples/simple_autopilot_private/main.tf b/examples/simple_autopilot_private/main.tf index 168c7796fc..d98f7f00df 100644 --- a/examples/simple_autopilot_private/main.tf +++ b/examples/simple_autopilot_private/main.tf @@ -34,8 +34,8 @@ provider "kubernetes" { } module "gke" { - source = "../../modules/beta-autopilot-private-cluster" - # [restore-marker] version = "~> 31.0" + source = "terraform-google-modules/kubernetes-engine/google//modules/beta-autopilot-private-cluster" + version = "~> 31.0" project_id = var.project_id name = "${local.cluster_type}-cluster" diff --git a/examples/simple_autopilot_private_non_default_sa/main.tf b/examples/simple_autopilot_private_non_default_sa/main.tf index 1854aeee87..332e41f1cc 100644 --- a/examples/simple_autopilot_private_non_default_sa/main.tf +++ b/examples/simple_autopilot_private_non_default_sa/main.tf @@ -34,8 +34,8 @@ provider "kubernetes" { } module "gke" { - source = "../../modules/beta-autopilot-private-cluster" - # [restore-marker] version = "~> 31.0" + source = "terraform-google-modules/kubernetes-engine/google//modules/beta-autopilot-private-cluster" + version = "~> 31.0" project_id = var.project_id name = "${local.cluster_type}-cluster" diff --git a/examples/simple_autopilot_public/main.tf b/examples/simple_autopilot_public/main.tf index 64004162d2..451ef70317 100644 --- a/examples/simple_autopilot_public/main.tf +++ b/examples/simple_autopilot_public/main.tf @@ -33,8 +33,8 @@ provider "kubernetes" { } module "gke" { - source = "../../modules/beta-autopilot-public-cluster" - # [restore-marker] version = "~> 31.0" + source = "terraform-google-modules/kubernetes-engine/google//modules/beta-autopilot-public-cluster" + version = "~> 31.0" project_id = var.project_id name = "${local.cluster_type}-cluster" diff --git a/examples/simple_regional/main.tf b/examples/simple_regional/main.tf index e81d4dc973..2127fa9eea 100644 --- a/examples/simple_regional/main.tf +++ b/examples/simple_regional/main.tf @@ -27,8 +27,8 @@ provider "kubernetes" { } module "gke" { - source = "../.." - # [restore-marker] version = "~> 31.0" + source = "terraform-google-modules/kubernetes-engine/google" + version = "~> 31.0" project_id = var.project_id name = "${local.cluster_type}-cluster${var.cluster_name_suffix}" diff --git a/examples/simple_regional_beta/main.tf b/examples/simple_regional_beta/main.tf index 3d67d5d95c..2c1f082af9 100644 --- a/examples/simple_regional_beta/main.tf +++ b/examples/simple_regional_beta/main.tf @@ -27,8 +27,8 @@ provider "kubernetes" { } module "gke" { - source = "../../modules/beta-public-cluster" - # [restore-marker] version = "~> 31.0" + source = "terraform-google-modules/kubernetes-engine/google//modules/beta-public-cluster" + version = "~> 31.0" project_id = var.project_id name = "${local.cluster_type}-cluster${var.cluster_name_suffix}" diff --git a/examples/simple_regional_private/main.tf b/examples/simple_regional_private/main.tf index 78ec5f7452..25cf124ef9 100644 --- a/examples/simple_regional_private/main.tf +++ b/examples/simple_regional_private/main.tf @@ -33,8 +33,8 @@ data "google_compute_subnetwork" "subnetwork" { } module "gke" { - source = "../../modules/private-cluster" - # [restore-marker] version = "~> 31.0" + source = "terraform-google-modules/kubernetes-engine/google//modules/private-cluster" + version = "~> 31.0" project_id = var.project_id name = "${local.cluster_type}-cluster${var.cluster_name_suffix}" diff --git a/examples/simple_regional_private_beta/main.tf b/examples/simple_regional_private_beta/main.tf index a6dae6e5d6..822c7946ce 100644 --- a/examples/simple_regional_private_beta/main.tf +++ b/examples/simple_regional_private_beta/main.tf @@ -33,8 +33,8 @@ data "google_compute_subnetwork" "subnetwork" { } module "gke" { - source = "../../modules/beta-private-cluster" - # [restore-marker] version = "~> 31.0" + source = "terraform-google-modules/kubernetes-engine/google//modules/beta-private-cluster" + version = "~> 31.0" project_id = var.project_id name = "${local.cluster_type}-cluster${var.cluster_name_suffix}" diff --git a/examples/simple_regional_private_with_cluster_version/main.tf b/examples/simple_regional_private_with_cluster_version/main.tf index f5d04c9566..23b5b83c99 100644 --- a/examples/simple_regional_private_with_cluster_version/main.tf +++ b/examples/simple_regional_private_with_cluster_version/main.tf @@ -33,8 +33,8 @@ data "google_compute_subnetwork" "subnetwork" { } module "gke" { - source = "../../modules/private-cluster" - # [restore-marker] version = "~> 31.0" + source = "terraform-google-modules/kubernetes-engine/google//modules/private-cluster" + version = "~> 31.0" project_id = var.project_id name = "${local.cluster_type}-cluster${var.cluster_name_suffix}" diff --git a/examples/simple_regional_with_gateway_api/main.tf b/examples/simple_regional_with_gateway_api/main.tf index 7da90e684d..34500ada3a 100644 --- a/examples/simple_regional_with_gateway_api/main.tf +++ b/examples/simple_regional_with_gateway_api/main.tf @@ -27,8 +27,8 @@ provider "kubernetes" { } module "gke" { - source = "../.." - # [restore-marker] version = "~> 31.0" + source = "terraform-google-modules/kubernetes-engine/google" + version = "~> 31.0" project_id = var.project_id name = "${local.cluster_type}-cluster${var.cluster_name_suffix}" diff --git a/examples/simple_regional_with_ipv6/main.tf b/examples/simple_regional_with_ipv6/main.tf index 59831f93ce..51fa9b6106 100644 --- a/examples/simple_regional_with_ipv6/main.tf +++ b/examples/simple_regional_with_ipv6/main.tf @@ -27,7 +27,7 @@ provider "kubernetes" { } module "gke" { - source = "../../" + source = "terraform-google-modules/kubernetes-engine/google" project_id = var.project_id name = "${local.cluster_type}-cluster${var.cluster_name_suffix}" regional = true diff --git a/examples/simple_regional_with_kubeconfig/main.tf b/examples/simple_regional_with_kubeconfig/main.tf index ede6a1b55e..7387bb0c15 100644 --- a/examples/simple_regional_with_kubeconfig/main.tf +++ b/examples/simple_regional_with_kubeconfig/main.tf @@ -27,8 +27,8 @@ provider "kubernetes" { } module "gke" { - source = "../.." - # [restore-marker] version = "~> 31.0" + source = "terraform-google-modules/kubernetes-engine/google" + version = "~> 31.0" project_id = var.project_id name = "${local.cluster_type}-cluster${var.cluster_name_suffix}" @@ -44,8 +44,8 @@ module "gke" { } module "gke_auth" { - source = "../../modules/auth" - # [restore-marker] version = "~> 31.0" + source = "terraform-google-modules/kubernetes-engine/google//modules/auth" + version = "~> 31.0" project_id = var.project_id location = module.gke.location diff --git a/examples/simple_regional_with_networking/main.tf b/examples/simple_regional_with_networking/main.tf index 9ddd45f029..a37c1fb6e9 100644 --- a/examples/simple_regional_with_networking/main.tf +++ b/examples/simple_regional_with_networking/main.tf @@ -52,8 +52,8 @@ module "gcp-network" { } module "gke" { - source = "../.." - # [restore-marker] version = "~> 31.0" + source = "terraform-google-modules/kubernetes-engine/google" + version = "~> 31.0" project_id = var.project_id name = var.cluster_name diff --git a/examples/simple_windows_node_pool/main.tf b/examples/simple_windows_node_pool/main.tf index c3eeb7e1bf..0562eea5a4 100644 --- a/examples/simple_windows_node_pool/main.tf +++ b/examples/simple_windows_node_pool/main.tf @@ -27,8 +27,8 @@ provider "kubernetes" { } module "gke" { - source = "../../modules/beta-public-cluster" - # [restore-marker] version = "~> 31.0" + source = "terraform-google-modules/kubernetes-engine/google//modules/beta-public-cluster" + version = "~> 31.0" project_id = var.project_id regional = false diff --git a/examples/simple_zonal_private/main.tf b/examples/simple_zonal_private/main.tf index 440e464ce9..138bfcd314 100644 --- a/examples/simple_zonal_private/main.tf +++ b/examples/simple_zonal_private/main.tf @@ -33,8 +33,8 @@ data "google_compute_subnetwork" "subnetwork" { } module "gke" { - source = "../../modules/private-cluster" - # [restore-marker] version = "~> 31.0" + source = "terraform-google-modules/kubernetes-engine/google//modules/private-cluster" + version = "~> 31.0" project_id = var.project_id name = "${local.cluster_type}-cluster${var.cluster_name_suffix}" diff --git a/examples/simple_zonal_with_acm/acm.tf b/examples/simple_zonal_with_acm/acm.tf index b3ddeebf76..56d510cb89 100644 --- a/examples/simple_zonal_with_acm/acm.tf +++ b/examples/simple_zonal_with_acm/acm.tf @@ -15,8 +15,8 @@ */ module "acm" { - source = "../../modules/acm" - # [restore-marker] version = "~> 31.0" + source = "terraform-google-modules/kubernetes-engine/google//modules/acm" + version = "~> 31.0" project_id = var.project_id location = module.gke.location diff --git a/examples/simple_zonal_with_acm/main.tf b/examples/simple_zonal_with_acm/main.tf index 1fda3bbc82..c62dc3b26b 100644 --- a/examples/simple_zonal_with_acm/main.tf +++ b/examples/simple_zonal_with_acm/main.tf @@ -31,8 +31,8 @@ provider "kubernetes" { } module "gke" { - source = "../.." - # [restore-marker] version = "~> 31.0" + source = "terraform-google-modules/kubernetes-engine/google" + version = "~> 31.0" project_id = var.project_id regional = false diff --git a/examples/simple_zonal_with_asm/main.tf b/examples/simple_zonal_with_asm/main.tf index 960cc2b821..f54653b1ed 100644 --- a/examples/simple_zonal_with_asm/main.tf +++ b/examples/simple_zonal_with_asm/main.tf @@ -27,8 +27,8 @@ data "google_project" "project" { } module "gke" { - source = "../.." - # [restore-marker] version = "~> 31.0" + source = "terraform-google-modules/kubernetes-engine/google" + version = "~> 31.0" project_id = var.project_id name = "test-prefix-cluster-test-suffix" @@ -56,8 +56,8 @@ module "gke" { } module "asm" { - source = "../../modules/asm" - # [restore-marker] version = "~> 31.0" + source = "terraform-google-modules/kubernetes-engine/google//modules/asm" + version = "~> 31.0" project_id = var.project_id cluster_name = module.gke.name diff --git a/examples/simple_zonal_with_hub/hub.tf b/examples/simple_zonal_with_hub/hub.tf index 73a165dc66..5b7171ab4c 100644 --- a/examples/simple_zonal_with_hub/hub.tf +++ b/examples/simple_zonal_with_hub/hub.tf @@ -15,8 +15,8 @@ */ module "hub" { - source = "../../modules/fleet-membership" - # [restore-marker] version = "~> 31.0" + source = "terraform-google-modules/kubernetes-engine/google//modules/fleet-membership" + version = "~> 31.0" project_id = var.project_id location = module.gke.location diff --git a/examples/simple_zonal_with_hub/main.tf b/examples/simple_zonal_with_hub/main.tf index 5fc8387529..6c13cbdbbc 100644 --- a/examples/simple_zonal_with_hub/main.tf +++ b/examples/simple_zonal_with_hub/main.tf @@ -27,8 +27,8 @@ provider "kubernetes" { } module "gke" { - source = "../.." - # [restore-marker] version = "~> 31.0" + source = "terraform-google-modules/kubernetes-engine/google" + version = "~> 31.0" project_id = var.project_id regional = false diff --git a/examples/simple_zonal_with_hub_kubeconfig/hub.tf b/examples/simple_zonal_with_hub_kubeconfig/hub.tf index 074357b23e..d904d87c6b 100644 --- a/examples/simple_zonal_with_hub_kubeconfig/hub.tf +++ b/examples/simple_zonal_with_hub_kubeconfig/hub.tf @@ -15,8 +15,8 @@ */ module "hub" { - source = "../../modules/hub-legacy" - # [restore-marker] version = "~> 31.0" + source = "terraform-google-modules/kubernetes-engine/google//modules/hub-legacy" + version = "~> 31.0" project_id = var.project_id location = "remote" diff --git a/examples/stub_domains/main.tf b/examples/stub_domains/main.tf index b41b106127..82599a7534 100644 --- a/examples/stub_domains/main.tf +++ b/examples/stub_domains/main.tf @@ -27,8 +27,8 @@ provider "kubernetes" { } module "gke" { - source = "../.." - # [restore-marker] version = "~> 31.0" + source = "terraform-google-modules/kubernetes-engine/google" + version = "~> 31.0" project_id = var.project_id name = "${local.cluster_type}-cluster${var.cluster_name_suffix}" diff --git a/examples/stub_domains_private/main.tf b/examples/stub_domains_private/main.tf index e2bdaded3c..5bb6268ffc 100644 --- a/examples/stub_domains_private/main.tf +++ b/examples/stub_domains_private/main.tf @@ -29,8 +29,8 @@ data "google_compute_subnetwork" "subnetwork" { } module "gke" { - source = "../../modules/private-cluster" - # [restore-marker] version = "~> 31.0" + source = "terraform-google-modules/kubernetes-engine/google//modules/private-cluster" + version = "~> 31.0" ip_range_pods = var.ip_range_pods ip_range_services = var.ip_range_services diff --git a/examples/stub_domains_upstream_nameservers/main.tf b/examples/stub_domains_upstream_nameservers/main.tf index 2a867aa3fb..5a95ab8e69 100644 --- a/examples/stub_domains_upstream_nameservers/main.tf +++ b/examples/stub_domains_upstream_nameservers/main.tf @@ -27,8 +27,8 @@ provider "kubernetes" { } module "gke" { - source = "../.." - # [restore-marker] version = "~> 31.0" + source = "terraform-google-modules/kubernetes-engine/google" + version = "~> 31.0" project_id = var.project_id name = "${local.cluster_type}-cluster${var.cluster_name_suffix}" diff --git a/examples/upstream_nameservers/main.tf b/examples/upstream_nameservers/main.tf index 087a90c4a0..876152ad28 100644 --- a/examples/upstream_nameservers/main.tf +++ b/examples/upstream_nameservers/main.tf @@ -27,8 +27,8 @@ provider "kubernetes" { } module "gke" { - source = "../.." - # [restore-marker] version = "~> 31.0" + source = "terraform-google-modules/kubernetes-engine/google" + version = "~> 31.0" project_id = var.project_id name = "${local.cluster_type}-cluster${var.cluster_name_suffix}" diff --git a/examples/workload_identity/main.tf b/examples/workload_identity/main.tf index 432723935a..98b406e31b 100644 --- a/examples/workload_identity/main.tf +++ b/examples/workload_identity/main.tf @@ -27,8 +27,8 @@ provider "kubernetes" { } module "gke" { - source = "../.." - # [restore-marker] version = "~> 31.0" + source = "terraform-google-modules/kubernetes-engine/google" + version = "~> 31.0" project_id = var.project_id name = "${local.cluster_type}-cluster${var.cluster_name_suffix}" @@ -53,8 +53,8 @@ module "gke" { # example without existing KSA module "workload_identity" { - source = "../../modules/workload-identity" - # [restore-marker] version = "~> 31.0" + source = "terraform-google-modules/kubernetes-engine/google//modules/workload-identity" + version = "~> 31.0" project_id = var.project_id name = "iden-${module.gke.name}" @@ -73,8 +73,8 @@ resource "kubernetes_service_account" "test" { } module "workload_identity_existing_ksa" { - source = "../../modules/workload-identity" - # [restore-marker] version = "~> 31.0" + source = "terraform-google-modules/kubernetes-engine/google//modules/workload-identity" + version = "~> 31.0" project_id = var.project_id name = "existing-${module.gke.name}" @@ -92,8 +92,8 @@ resource "google_service_account" "custom" { } module "workload_identity_existing_gsa" { - source = "../../modules/workload-identity" - # [restore-marker] version = "~> 31.0" + source = "terraform-google-modules/kubernetes-engine/google//modules/workload-identity" + version = "~> 31.0" project_id = var.project_id name = google_service_account.custom.account_id diff --git a/examples/workload_metadata_config/main.tf b/examples/workload_metadata_config/main.tf index c1f522a768..4ee285814d 100644 --- a/examples/workload_metadata_config/main.tf +++ b/examples/workload_metadata_config/main.tf @@ -33,8 +33,8 @@ data "google_compute_subnetwork" "subnetwork" { } module "gke" { - source = "../../modules/private-cluster" - # [restore-marker] version = "~> 31.0" + source = "terraform-google-modules/kubernetes-engine/google//modules/private-cluster" + version = "~> 31.0" project_id = var.project_id name = "${local.cluster_type}-cluster${var.cluster_name_suffix}" From ee32011600abff7228532e0348432e2ef23eb032 Mon Sep 17 00:00:00 2001 From: Andrew Peabody Date: Mon, 19 Aug 2024 12:15:24 -0700 Subject: [PATCH 4/4] add "gcfsConfig" to testdata --- .../testdata/TestPrivateZonalWithNetworking.json | 1 + 1 file changed, 1 insertion(+) diff --git a/test/integration/private_zonal_with_networking/testdata/TestPrivateZonalWithNetworking.json b/test/integration/private_zonal_with_networking/testdata/TestPrivateZonalWithNetworking.json index c6bdd3f7cb..8a2ab04442 100755 --- a/test/integration/private_zonal_with_networking/testdata/TestPrivateZonalWithNetworking.json +++ b/test/integration/private_zonal_with_networking/testdata/TestPrivateZonalWithNetworking.json @@ -210,6 +210,7 @@ "config": { "diskSizeGb": 100, "diskType": "pd-standard", + "gcfsConfig": {}, "imageType": "COS_CONTAINERD", "labels": { "cluster_name": "CLUSTER_NAME",