Merge branch 'main' into main

feng-zhe · web-flow · commit af1424098abd · 2025-04-18T10:27:27.000-07:00
diff --git a/build/int.cloudbuild.yaml b/build/int.cloudbuild.yaml
@@ -63,6 +63,18 @@ steps:
       echo -n "Folders in scope for tests:"
       find . -type d -printf '%P\n'
 
+- id: resource specific fixups
+  name: golang:1.23
+  entrypoint: bash
+  args:
+    - -c
+    - |
+      set -e
+      go install github.com/minamijoyo/hcledit@v0.2.17
+
+      # Add `deletion_protection = false` to google_container_cluster.default resources
+      find ./gke -name "*.tf" -print | xargs -t -I {} $$GOPATH/bin/hcledit attribute append resource.google_container_cluster.default.deletion_protection 'false' -u -f {} || true
+
 - id: prepare
   name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
   args: ['/bin/bash', '-c', 'source /usr/local/bin/task_helper_functions.sh && prepare_environment']
diff --git a/gke/autopilot/basic/main.tf b/gke/autopilot/basic/main.tf
@@ -20,9 +20,5 @@ resource "google_container_cluster" "default" {
   location = "us-central1"
 
   enable_autopilot = true
-
-  # Set `deletion_protection` to `true` will ensure that one cannot
-  # accidentally delete this instance by use of Terraform.
-  deletion_protection = false
 }
 # [END gke_autopilot_basic]
diff --git a/gke/autopilot/config_sync/git/main.tf b/gke/autopilot/config_sync/git/main.tf
@@ -26,10 +26,6 @@ resource "google_container_cluster" "default" {
   }
 
   enable_autopilot = true
-
-  # Set `deletion_protection` to `true` will ensure that one cannot
-  # accidentally delete this instance by use of Terraform.
-  deletion_protection = false
 }
 
 resource "google_gke_hub_feature" "configmanagement_feature" {
diff --git a/gke/autopilot/config_sync/oci/main.tf b/gke/autopilot/config_sync/oci/main.tf
@@ -26,10 +26,6 @@ resource "google_container_cluster" "default" {
   }
 
   enable_autopilot = true
-
-  # Set `deletion_protection` to `true` will ensure that one cannot
-  # accidentally delete this instance by use of Terraform.
-  deletion_protection = false
 }
 
 resource "google_gke_hub_feature" "configmanagement_feature" {
diff --git a/gke/autopilot/iap/main.tf b/gke/autopilot/iap/main.tf
@@ -22,10 +22,6 @@ resource "google_container_cluster" "default" {
   location = "us-central1"
 
   enable_autopilot = true
-
-  # Set `deletion_protection` to `true` will ensure that one cannot
-  # accidentally delete this instance by use of Terraform.
-  deletion_protection = false
 }
 
 # Required for internal ingress
diff --git a/gke/autopilot/labels/main.tf b/gke/autopilot/labels/main.tf
@@ -24,9 +24,5 @@ resource "google_container_cluster" "default" {
   resource_labels = {
     foo = "bar"
   }
-
-  # Set `deletion_protection` to `true` will ensure that one cannot
-  # accidentally delete this instance by use of Terraform.
-  deletion_protection = false
 }
 # [END gke_autopilot_labels]
diff --git a/gke/autopilot/mesh/main.tf b/gke/autopilot/mesh/main.tf
@@ -35,10 +35,6 @@ resource "google_container_cluster" "default" {
   fleet {
     project = data.google_project.default.project_id
   }
-
-  # Set `deletion_protection` to `true` will ensure that one cannot
-  # accidentally delete this instance by use of Terraform.
-  deletion_protection = false
 }
 
 resource "google_gke_hub_feature" "default" {
diff --git a/gke/autopilot/policycontroller/main.tf b/gke/autopilot/policycontroller/main.tf
@@ -36,10 +36,6 @@ resource "google_container_cluster" "default" {
   fleet {
     project = data.google_project.default.project_id
   }
-
-  # Set `deletion_protection` to `true` will ensure that one cannot
-  # accidentally delete this instance by use of Terraform.
-  deletion_protection = false
 }
 
 resource "google_gke_hub_feature" "default" {
diff --git a/gke/autopilot/release_channel/main.tf b/gke/autopilot/release_channel/main.tf
@@ -24,9 +24,5 @@ resource "google_container_cluster" "default" {
   release_channel {
     channel = "REGULAR"
   }
-
-  # Set `deletion_protection` to `true` will ensure that one cannot
-  # accidentally delete this instance by use of Terraform.
-  deletion_protection = false
 }
 # [END gke_autopilot_release_channel]
diff --git a/gke/autopilot/reservation/main.tf b/gke/autopilot/reservation/main.tf
@@ -21,10 +21,6 @@ resource "google_container_cluster" "default" {
   location = "us-central1"
 
   enable_autopilot = true
-
-  # Set `deletion_protection` to `true` will ensure that one cannot
-  # accidentally delete this instance by use of Terraform.
-  deletion_protection = false
 }
 
 # [START gke_autopilot_reservation_specific_reservation]
diff --git a/gke/autopilot/tag/main.tf b/gke/autopilot/tag/main.tf
@@ -20,10 +20,6 @@ resource "google_container_cluster" "default" {
   location = "us-central1"
 
   enable_autopilot = true
-
-  # Set `deletion_protection` to `true` will ensure that one cannot
-  # accidentally delete this instance by use of Terraform.
-  deletion_protection = false
 }
 
 data "google_project" "default" {}
diff --git a/gke/standard/regional/binary-authorization/main.tf b/gke/standard/regional/binary-authorization/main.tf
@@ -15,17 +15,13 @@
 */
 
 # [START gke_standard_regional_binauthz_enforce]
-resource "google_container_cluster" "enforce" {
+resource "google_container_cluster" "default" {
   name               = "gke-standard-regional-binauthz-enforce"
   location           = "us-west1"
   initial_node_count = 1
 
   binary_authorization {
     evaluation_mode = "PROJECT_SINGLETON_POLICY_ENFORCE"
   }
-
-  # Set `deletion_protection` to `true` will ensure that one cannot
-  # accidentally delete this instance by use of Terraform.
-  deletion_protection = false
 }
 # [END gke_standard_regional_binauthz_enforce]
diff --git a/gke/standard/regional/gemma-tgi/main.tf b/gke/standard/regional/gemma-tgi/main.tf
@@ -29,10 +29,6 @@ resource "google_container_cluster" "default" {
   workload_identity_config {
     workload_pool = "${data.google_project.default.project_id}.svc.id.goog"
   }
-
-  # Set `deletion_protection` to `true` will ensure that one cannot
-  # accidentally delete this instance by use of Terraform.
-  deletion_protection = false
 }
 
 resource "google_container_node_pool" "default" {
diff --git a/gke/standard/regional/hpa-logs/main.tf b/gke/standard/regional/hpa-logs/main.tf
@@ -23,9 +23,5 @@ resource "google_container_cluster" "default" {
   logging_config {
     enable_components = ["SYSTEM_COMPONENTS", "KCP_HPA"]
   }
-
-  # Set `deletion_protection` to `true` will ensure that one cannot
-  # accidentally delete this instance by use of Terraform.
-  deletion_protection = false
 }
 # [END gke_standard_regional_hpa_logs]
diff --git a/gke/standard/regional/labels/main.tf b/gke/standard/regional/labels/main.tf
@@ -24,10 +24,6 @@ resource "google_container_cluster" "default" {
   resource_labels = {
     foo = "bar"
   }
-
-  # Set `deletion_protection` to `true` will ensure that one cannot
-  # accidentally delete this instance by use of Terraform.
-  deletion_protection = false
 }
 # [END gke_standard_regional_labels_cluster]
 # [END gke_standard_regional_labels]
diff --git a/gke/standard/regional/loadbalancer/main.tf b/gke/standard/regional/loadbalancer/main.tf
@@ -22,10 +22,6 @@ resource "google_container_cluster" "default" {
   initial_node_count = 1
 
   enable_l4_ilb_subsetting = true
-
-  # Set `deletion_protection` to `true` will ensure that one cannot
-  # accidentally delete this instance by use of Terraform.
-  deletion_protection = false
 }
 # [END gke_standard_regional_loadbalancer_cluster]
 
diff --git a/gke/standard/regional/multi-zone/main.tf b/gke/standard/regional/multi-zone/main.tf
@@ -20,9 +20,5 @@ resource "google_container_cluster" "default" {
   location           = "us-central1"
   node_locations     = ["us-central1-b", "us-central1-c"]
   initial_node_count = 2
-
-  # Set `deletion_protection` to `true` will ensure that one cannot
-  # accidentally delete this instance by use of Terraform.
-  deletion_protection = false
 }
 # [END gke_standard_regional_multi_zone]
diff --git a/gke/standard/regional/node_pool/main.tf b/gke/standard/regional/node_pool/main.tf
@@ -25,10 +25,6 @@ resource "google_container_cluster" "default" {
 
   initial_node_count       = 1
   remove_default_node_pool = true
-
-  # Set `deletion_protection` to `true` will ensure that one cannot
-  # accidentally delete this instance by use of Terraform.
-  deletion_protection = false
 }
 
 # [START gke_standard_regional_node_pool]
diff --git a/gke/standard/regional/node_system_config/main.tf b/gke/standard/regional/node_system_config/main.tf
@@ -42,10 +42,6 @@ resource "google_container_cluster" "default" {
       }
     }
   }
-
-  # Set `deletion_protection` to `true` will ensure that one cannot
-  # accidentally delete this instance by use of Terraform.
-  deletion_protection = false
 }
 # [END gke_standard_regional_node_system_config]
 
diff --git a/gke/standard/regional/ray/main.tf b/gke/standard/regional/ray/main.tf
@@ -15,7 +15,7 @@
 */
 
 # [START gke_standard_regional_ray_operator]
-resource "google_container_cluster" "ray-cluster" {
+resource "google_container_cluster" "default" {
   name     = "gke-standard-regional-ray-operator"
   location = "us-west1"
 
@@ -36,9 +36,5 @@ resource "google_container_cluster" "ray-cluster" {
       }
     }
   }
-
-  # Set `deletion_protection` to `true` will ensure that one cannot
-  # accidentally delete this instance by use of Terraform.
-  deletion_protection = false
 }
 # [END gke_standard_regional_ray_operator]
diff --git a/gke/standard/regional/single-zone/main.tf b/gke/standard/regional/single-zone/main.tf
@@ -20,9 +20,5 @@ resource "google_container_cluster" "default" {
   location           = "us-west1"
   node_locations     = ["us-west1-c"]
   initial_node_count = 2
-
-  # Set `deletion_protection` to `true` will ensure that one cannot
-  # accidentally delete this instance by use of Terraform.
-  deletion_protection = false
 }
 # [END gke_standard_regional_single_zone]
diff --git a/gke/standard/regional/windows/main.tf b/gke/standard/regional/windows/main.tf
@@ -21,10 +21,6 @@ resource "google_container_cluster" "default" {
   location = "us-west1"
 
   initial_node_count = 1
-
-  # Set `deletion_protection` to `true` will ensure that one cannot
-  # accidentally delete this instance by use of Terraform.
-  deletion_protection = false
 }
 # [END gke_standard_regional_windows_cluster]
 
diff --git a/gke/standard/zonal/arm/main.tf b/gke/standard/zonal/arm/main.tf
@@ -31,10 +31,6 @@ resource "google_container_cluster" "default" {
     machine_type    = "t2a-standard-1"
     service_account = google_service_account.default.email
   }
-
-  # Set `deletion_protection` to `true` will ensure that one cannot
-  # accidentally delete this instance by use of Terraform.
-  deletion_protection = false
 }
 # [END gke_standard_zonal_arm_cluster]
 
diff --git a/gke/standard/zonal/gpu/main.tf b/gke/standard/zonal/gpu/main.tf
@@ -30,9 +30,5 @@ resource "google_container_cluster" "default" {
     }
     machine_type = "n1-standard-2"
   }
-
-  # Set `deletion_protection` to `true` will ensure that one cannot
-  # accidentally delete this instance by use of Terraform.
-  deletion_protection = false
 }
 # [END gke_standard_zonal_gpu]
diff --git a/gke/standard/zonal/multi-zone/main.tf b/gke/standard/zonal/multi-zone/main.tf
@@ -20,9 +20,5 @@ resource "google_container_cluster" "default" {
   location           = "us-central1-a"
   node_locations     = ["us-central1-b", "us-central1-c"]
   initial_node_count = 2
-
-  # Set `deletion_protection` to `true` will ensure that one cannot
-  # accidentally delete this instance by use of Terraform.
-  deletion_protection = false
 }
 # [END gke_standard_zonal_multi_zone]
diff --git a/gke/standard/zonal/node_image/main.tf b/gke/standard/zonal/node_image/main.tf
@@ -22,9 +22,5 @@ resource "google_container_cluster" "default" {
   node_config {
     image_type = "cos_containerd"
   }
-
-  # Set `deletion_protection` to `true` will ensure that one cannot
-  # accidentally delete this instance by use of Terraform.
-  deletion_protection = false
 }
 # [END gke_standard_zonal_node_image]
diff --git a/gke/standard/zonal/reservation/main.tf b/gke/standard/zonal/reservation/main.tf
@@ -47,10 +47,6 @@ resource "google_container_cluster" "default" {
   depends_on = [
     google_compute_reservation.any_reservation
   ]
-
-  # Set `deletion_protection` to `true` will ensure that one cannot
-  # accidentally delete this instance by use of Terraform.
-  deletion_protection = false
 }
 # [END gke_standard_zonal_reservation_any_cluster]
 
diff --git a/gke/standard/zonal/secondary-boot-disk/main.tf b/gke/standard/zonal/secondary-boot-disk/main.tf
@@ -23,10 +23,6 @@ resource "google_container_cluster" "default" {
   # secondary_boot_disks require GKE 1.28.3-gke.106700 or later, which should
   # be true for all release channels apart from EXTENDED.
   # If required, Use `release_channel = "EXTENDED"` and set `min_master_version`.
-
-  # Setting `deletion_protection` to `true` would prevent
-  # accidental deletion of this instance using Terraform.
-  deletion_protection = false
 }
 # [END gke_standard_zonal_secondary_boot_disk_cluster]
 
diff --git a/gke/standard/zonal/single-zone/main.tf b/gke/standard/zonal/single-zone/main.tf
@@ -19,9 +19,5 @@ resource "google_container_cluster" "default" {
   name               = "gke-standard-zonal-single-zone"
   location           = "us-central1-a"
   initial_node_count = 1
-
-  # Set `deletion_protection` to `true` will ensure that one cannot
-  # accidentally delete this instance by use of Terraform.
-  deletion_protection = false
 }
 # [END gke_standard_zonal_single_zone]

Original file line number	Diff line number	Diff line change
`@@ -20,9 +20,5 @@ resource "google_container_cluster" "default" {`
`20`	`20`	`location = "us-central1"`
`21`	`21`
`22`	`22`	`enable_autopilot = true`
`23`		`-`
`24`		- # Set `deletion_protection` to `true` will ensure that one cannot
`25`		`- # accidentally delete this instance by use of Terraform.`
`26`		`- deletion_protection = false`
`27`	`23`	`}`
`28`	`24`	`# [END gke_autopilot_basic]`
Original file line number	Diff line number	Diff line change
`@@ -26,10 +26,6 @@ resource "google_container_cluster" "default" {`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`enable_autopilot = true`
`29`		`-`
`30`		- # Set `deletion_protection` to `true` will ensure that one cannot
`31`		`- # accidentally delete this instance by use of Terraform.`
`32`		`- deletion_protection = false`
`33`	`29`	`}`
`34`	`30`
`35`	`31`	`resource "google_gke_hub_feature" "configmanagement_feature" {`
Original file line number	Diff line number	Diff line change
`@@ -22,10 +22,6 @@ resource "google_container_cluster" "default" {`
`22`	`22`	`location = "us-central1"`
`23`	`23`
`24`	`24`	`enable_autopilot = true`
`25`		`-`
`26`		- # Set `deletion_protection` to `true` will ensure that one cannot
`27`		`- # accidentally delete this instance by use of Terraform.`
`28`		`- deletion_protection = false`
`29`	`25`	`}`
`30`	`26`
`31`	`27`	`# Required for internal ingress`
Original file line number	Diff line number	Diff line change
`@@ -24,9 +24,5 @@ resource "google_container_cluster" "default" {`
`24`	`24`	`resource_labels = {`
`25`	`25`	`foo = "bar"`
`26`	`26`	`}`
`27`		`-`
`28`		- # Set `deletion_protection` to `true` will ensure that one cannot
`29`		`- # accidentally delete this instance by use of Terraform.`
`30`		`- deletion_protection = false`
`31`	`27`	`}`
`32`	`28`	`# [END gke_autopilot_labels]`
Original file line number	Diff line number	Diff line change
`@@ -35,10 +35,6 @@ resource "google_container_cluster" "default" {`
`35`	`35`	`fleet {`
`36`	`36`	`project = data.google_project.default.project_id`
`37`	`37`	`}`
`38`		`-`
`39`		- # Set `deletion_protection` to `true` will ensure that one cannot
`40`		`- # accidentally delete this instance by use of Terraform.`
`41`		`- deletion_protection = false`
`42`	`38`	`}`
`43`	`39`
`44`	`40`	`resource "google_gke_hub_feature" "default" {`
Original file line number	Diff line number	Diff line change
`@@ -36,10 +36,6 @@ resource "google_container_cluster" "default" {`
`36`	`36`	`fleet {`
`37`	`37`	`project = data.google_project.default.project_id`
`38`	`38`	`}`
`39`		`-`
`40`		- # Set `deletion_protection` to `true` will ensure that one cannot
`41`		`- # accidentally delete this instance by use of Terraform.`
`42`		`- deletion_protection = false`
`43`	`39`	`}`
`44`	`40`
`45`	`41`	`resource "google_gke_hub_feature" "default" {`
Original file line number	Diff line number	Diff line change
`@@ -21,10 +21,6 @@ resource "google_container_cluster" "default" {`
`21`	`21`	`location = "us-central1"`
`22`	`22`
`23`	`23`	`enable_autopilot = true`
`24`		`-`
`25`		- # Set `deletion_protection` to `true` will ensure that one cannot
`26`		`- # accidentally delete this instance by use of Terraform.`
`27`		`- deletion_protection = false`
`28`	`24`	`}`
`29`	`25`
`30`	`26`	`# [START gke_autopilot_reservation_specific_reservation]`