Merge branch 'main' into confidential-nodes-gpu

apeabody · web-flow · commit 83b8aabdc941 · 2025-08-29T13:08:14.000-07:00
diff --git a/Makefile b/Makefile
@@ -76,14 +76,13 @@ docker_test_lint:
 		/usr/local/bin/test_lint.sh
 
 # Generate documentation
-# Removed `display` for https://github.com/GoogleCloudPlatform/cloud-foundation-toolkit/issues/3140
 .PHONY: docker_generate_docs
 docker_generate_docs:
 	$(DOCKER_BIN) run --rm -it \
 		-e ENABLE_BPMETADATA=1 \
 		-v "$(CURDIR)":/workspace \
 		$(REGISTRY_URL)/${DOCKER_IMAGE_DEVELOPER_TOOLS}:${DOCKER_TAG_VERSION_DEVELOPER_TOOLS} \
-		/bin/bash -c 'source /usr/local/bin/task_helper_functions.sh && generate_docs --per-module-requirements'
+		/bin/bash -c 'source /usr/local/bin/task_helper_functions.sh && generate_docs -d --per-module-requirements'
 
 # Generate files from autogen
 .PHONY: docker_generate_modules
diff --git a/autogen/main/versions.tf.tmpl b/autogen/main/versions.tf.tmpl
@@ -24,33 +24,33 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 6.42.0, < 7"
+      version = ">= 6.42.0, < 8"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 6.42.0, < 7"
+      version = ">= 6.42.0, < 8"
     }
 {% elif beta_cluster and autopilot_cluster %}
   required_providers {
     google = {
       source = "hashicorp/google"
-      version = ">= 6.42.0, < 7"
+      version = ">= 6.42.0, < 8"
     }
     google-beta = {
       source = "hashicorp/google-beta"
-      version = ">= 6.42.0, < 7"
+      version = ">= 6.42.0, < 8"
     }
 {% elif autopilot_cluster  %}
   required_providers {
     google = {
       source = "hashicorp/google"
-      version = ">= 6.42.0, < 7"
+      version = ">= 6.42.0, < 8"
     }
 {% else %}
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 6.42.0, < 7"
+      version = ">= 6.42.0, < 8"
     }
 {% endif %}
     kubernetes = {
diff --git a/metadata.yaml b/metadata.yaml
@@ -828,7 +828,7 @@ spec:
           - roles/editor
     providerVersions:
       - source: hashicorp/google
-        version: ">= 6.42.0, < 7"
+        version: ">= 6.42.0, < 8"
       - source: hashicorp/kubernetes
         version: ~> 2.10
       - source: hashicorp/random
diff --git a/modules/auth/metadata.yaml b/modules/auth/metadata.yaml
@@ -160,4 +160,4 @@ spec:
           - roles/editor
     providerVersions:
       - source: hashicorp/google
-        version: ">= 4.47.0, != 4.49.0, != 4.50.0, < 7"
+        version: ">= 4.47.0, != 4.49.0, != 4.50.0, < 8"
diff --git a/modules/auth/versions.tf b/modules/auth/versions.tf
@@ -21,7 +21,7 @@ terraform {
     google = {
       source = "hashicorp/google"
       # Avoid v4.49 and v4.50 for https://github.com/hashicorp/terraform-provider-google/issues/13507
-      version = ">= 4.47.0, != 4.49.0, != 4.50.0, < 7"
+      version = ">= 4.47.0, != 4.49.0, != 4.50.0, < 8"
     }
   }
 
diff --git a/modules/beta-autopilot-private-cluster/metadata.yaml b/modules/beta-autopilot-private-cluster/metadata.yaml
@@ -571,9 +571,9 @@ spec:
           - roles/editor
     providerVersions:
       - source: hashicorp/google
-        version: ">= 6.42.0, < 7"
+        version: ">= 6.42.0, < 8"
       - source: hashicorp/google-beta
-        version: ">= 6.42.0, < 7"
+        version: ">= 6.42.0, < 8"
       - source: hashicorp/kubernetes
         version: ~> 2.10
       - source: hashicorp/random
diff --git a/modules/beta-autopilot-private-cluster/versions.tf b/modules/beta-autopilot-private-cluster/versions.tf
@@ -21,11 +21,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 6.42.0, < 7"
+      version = ">= 6.42.0, < 8"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 6.42.0, < 7"
+      version = ">= 6.42.0, < 8"
     }
     kubernetes = {
       source  = "hashicorp/kubernetes"
diff --git a/modules/beta-autopilot-public-cluster/metadata.yaml b/modules/beta-autopilot-public-cluster/metadata.yaml
@@ -545,9 +545,9 @@ spec:
           - roles/editor
     providerVersions:
       - source: hashicorp/google
-        version: ">= 6.42.0, < 7"
+        version: ">= 6.42.0, < 8"
       - source: hashicorp/google-beta
-        version: ">= 6.42.0, < 7"
+        version: ">= 6.42.0, < 8"
       - source: hashicorp/kubernetes
         version: ~> 2.10
       - source: hashicorp/random
diff --git a/modules/beta-autopilot-public-cluster/versions.tf b/modules/beta-autopilot-public-cluster/versions.tf
@@ -21,11 +21,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 6.42.0, < 7"
+      version = ">= 6.42.0, < 8"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 6.42.0, < 7"
+      version = ">= 6.42.0, < 8"
     }
     kubernetes = {
       source  = "hashicorp/kubernetes"
diff --git a/modules/beta-private-cluster-update-variant/metadata.yaml b/modules/beta-private-cluster-update-variant/metadata.yaml
@@ -863,9 +863,9 @@ spec:
           - roles/editor
     providerVersions:
       - source: hashicorp/google
-        version: ">= 6.42.0, < 7"
+        version: ">= 6.42.0, < 8"
       - source: hashicorp/google-beta
-        version: ">= 6.42.0, < 7"
+        version: ">= 6.42.0, < 8"
       - source: hashicorp/kubernetes
         version: ~> 2.10
       - source: hashicorp/random
diff --git a/modules/beta-private-cluster-update-variant/versions.tf b/modules/beta-private-cluster-update-variant/versions.tf
@@ -21,11 +21,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 6.42.0, < 7"
+      version = ">= 6.42.0, < 8"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 6.42.0, < 7"
+      version = ">= 6.42.0, < 8"
     }
     kubernetes = {
       source  = "hashicorp/kubernetes"
diff --git a/modules/beta-private-cluster/metadata.yaml b/modules/beta-private-cluster/metadata.yaml
@@ -863,9 +863,9 @@ spec:
           - roles/editor
     providerVersions:
       - source: hashicorp/google
-        version: ">= 6.42.0, < 7"
+        version: ">= 6.42.0, < 8"
       - source: hashicorp/google-beta
-        version: ">= 6.42.0, < 7"
+        version: ">= 6.42.0, < 8"
       - source: hashicorp/kubernetes
         version: ~> 2.10
       - source: hashicorp/random
diff --git a/modules/beta-private-cluster/versions.tf b/modules/beta-private-cluster/versions.tf
@@ -21,11 +21,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 6.42.0, < 7"
+      version = ">= 6.42.0, < 8"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 6.42.0, < 7"
+      version = ">= 6.42.0, < 8"
     }
     kubernetes = {
       source  = "hashicorp/kubernetes"
diff --git a/modules/beta-public-cluster-update-variant/metadata.yaml b/modules/beta-public-cluster-update-variant/metadata.yaml
@@ -837,9 +837,9 @@ spec:
           - roles/editor
     providerVersions:
       - source: hashicorp/google
-        version: ">= 6.42.0, < 7"
+        version: ">= 6.42.0, < 8"
       - source: hashicorp/google-beta
-        version: ">= 6.42.0, < 7"
+        version: ">= 6.42.0, < 8"
       - source: hashicorp/kubernetes
         version: ~> 2.10
       - source: hashicorp/random
diff --git a/modules/beta-public-cluster-update-variant/versions.tf b/modules/beta-public-cluster-update-variant/versions.tf
@@ -21,11 +21,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 6.42.0, < 7"
+      version = ">= 6.42.0, < 8"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 6.42.0, < 7"
+      version = ">= 6.42.0, < 8"
     }
     kubernetes = {
       source  = "hashicorp/kubernetes"
diff --git a/modules/beta-public-cluster/metadata.yaml b/modules/beta-public-cluster/metadata.yaml
@@ -837,9 +837,9 @@ spec:
           - roles/editor
     providerVersions:
       - source: hashicorp/google
-        version: ">= 6.42.0, < 7"
+        version: ">= 6.42.0, < 8"
       - source: hashicorp/google-beta
-        version: ">= 6.42.0, < 7"
+        version: ">= 6.42.0, < 8"
       - source: hashicorp/kubernetes
         version: ~> 2.10
       - source: hashicorp/random
diff --git a/modules/beta-public-cluster/versions.tf b/modules/beta-public-cluster/versions.tf
@@ -21,11 +21,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 6.42.0, < 7"
+      version = ">= 6.42.0, < 8"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 6.42.0, < 7"
+      version = ">= 6.42.0, < 8"
     }
     kubernetes = {
       source  = "hashicorp/kubernetes"
diff --git a/modules/binary-authorization/metadata.yaml b/modules/binary-authorization/metadata.yaml
@@ -164,6 +164,6 @@ spec:
           - roles/editor
     providerVersions:
       - source: hashicorp/google
-        version: < 7
+        version: < 8
       - source: hashicorp/google-beta
-        version: < 7
+        version: < 8
diff --git a/modules/binary-authorization/versions.tf b/modules/binary-authorization/versions.tf
@@ -20,11 +20,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = "< 7"
+      version = "< 8"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = "< 7"
+      version = "< 8"
     }
   }
   provider_meta "google" {
diff --git a/modules/fleet-membership/metadata.yaml b/modules/fleet-membership/metadata.yaml
@@ -172,6 +172,6 @@ spec:
           - roles/editor
     providerVersions:
       - source: hashicorp/google
-        version: ">= 5.6.0, < 7"
+        version: ">= 5.6.0, < 8"
       - source: hashicorp/google-beta
-        version: ">= 5.6.0, < 7"
+        version: ">= 5.6.0, < 8"
diff --git a/modules/fleet-membership/versions.tf b/modules/fleet-membership/versions.tf
@@ -21,11 +21,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 5.6.0, < 7"
+      version = ">= 5.6.0, < 8"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 5.6.0, < 7"
+      version = ">= 5.6.0, < 8"
     }
   }
 
diff --git a/modules/gke-autopilot-cluster/metadata.yaml b/modules/gke-autopilot-cluster/metadata.yaml
@@ -571,12 +571,12 @@ spec:
     roles:
       - level: Project
         roles:
+          - roles/iam.serviceAccountUser
           - roles/compute.admin
           - roles/container.admin
-          - roles/iam.serviceAccountUser
     services:
       - compute.googleapis.com
       - container.googleapis.com
     providerVersions:
       - source: hashicorp/google-beta
-        version: ">= 6.33.0, < 7"
+        version: ">= 6.33.0, < 8"
diff --git a/modules/gke-autopilot-cluster/versions.tf b/modules/gke-autopilot-cluster/versions.tf
@@ -20,7 +20,7 @@ terraform {
   required_providers {
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 6.33.0, < 7"
+      version = ">= 6.33.0, < 8"
     }
   }
   provider_meta "google-beta" {
diff --git a/modules/gke-node-pool/metadata.yaml b/modules/gke-node-pool/metadata.yaml
@@ -413,4 +413,4 @@ spec:
       - container.googleapis.com
     providerVersions:
       - source: hashicorp/google-beta
-        version: ">= 6.33.0, < 7"
+        version: ">= 6.33.0, < 8"
diff --git a/modules/gke-node-pool/versions.tf b/modules/gke-node-pool/versions.tf
@@ -20,7 +20,7 @@ terraform {
   required_providers {
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 6.33.0, < 7"
+      version = ">= 6.33.0, < 8"
     }
   }
   provider_meta "google-beta" {
diff --git a/modules/gke-standard-cluster/metadata.yaml b/modules/gke-standard-cluster/metadata.yaml
@@ -1018,4 +1018,4 @@ spec:
       - container.googleapis.com
     providerVersions:
       - source: hashicorp/google-beta
-        version: ">= 6.33.0, < 7"
+        version: ">= 6.33.0, < 8"
diff --git a/modules/gke-standard-cluster/versions.tf b/modules/gke-standard-cluster/versions.tf
@@ -20,7 +20,7 @@ terraform {
   required_providers {
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 6.33.0, < 7"
+      version = ">= 6.33.0, < 8"
     }
   }
   provider_meta "google-beta" {
diff --git a/modules/hub-legacy/metadata.yaml b/modules/hub-legacy/metadata.yaml
@@ -193,6 +193,6 @@ spec:
           - roles/editor
     providerVersions:
       - source: hashicorp/google
-        version: < 7
+        version: < 8
       - source: hashicorp/google-beta
-        version: < 7
+        version: < 8
diff --git a/modules/hub-legacy/versions.tf b/modules/hub-legacy/versions.tf
@@ -20,11 +20,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = "< 7"
+      version = "< 8"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = "< 7"
+      version = "< 8"
     }
   }
   provider_meta "google" {
diff --git a/modules/private-cluster-update-variant/metadata.yaml b/modules/private-cluster-update-variant/metadata.yaml
@@ -814,7 +814,7 @@ spec:
           - roles/editor
     providerVersions:
       - source: hashicorp/google
-        version: ">= 6.42.0, < 7"
+        version: ">= 6.42.0, < 8"
       - source: hashicorp/kubernetes
         version: ~> 2.10
       - source: hashicorp/random
diff --git a/modules/private-cluster-update-variant/versions.tf b/modules/private-cluster-update-variant/versions.tf
@@ -21,7 +21,7 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 6.42.0, < 7"
+      version = ">= 6.42.0, < 8"
     }
     kubernetes = {
       source  = "hashicorp/kubernetes"
diff --git a/modules/private-cluster/metadata.yaml b/modules/private-cluster/metadata.yaml
@@ -814,7 +814,7 @@ spec:
           - roles/editor
     providerVersions:
       - source: hashicorp/google
-        version: ">= 6.42.0, < 7"
+        version: ">= 6.42.0, < 8"
       - source: hashicorp/kubernetes
         version: ~> 2.10
       - source: hashicorp/random
diff --git a/modules/private-cluster/versions.tf b/modules/private-cluster/versions.tf
@@ -21,7 +21,7 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 6.42.0, < 7"
+      version = ">= 6.42.0, < 8"
     }
     kubernetes = {
       source  = "hashicorp/kubernetes"
diff --git a/modules/workload-identity/metadata.yaml b/modules/workload-identity/metadata.yaml
diff --git a/modules/workload-identity/versions.tf b/modules/workload-identity/versions.tf
diff --git a/test/integration/go.mod b/test/integration/go.mod
diff --git a/test/integration/go.sum b/test/integration/go.sum
diff --git a/versions.tf b/versions.tf

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ terraform {`
`21`	`21`	`google = {`
`22`	`22`	`source = "hashicorp/google"`
`23`	`23`	`# Avoid v4.49 and v4.50 for https://github.com/hashicorp/terraform-provider-google/issues/13507`
`24`		`- version = ">= 4.47.0, != 4.49.0, != 4.50.0, < 7"`
	`24`	`+ version = ">= 4.47.0, != 4.49.0, != 4.50.0, < 8"`
`25`	`25`	`}`
`26`	`26`	`}`
`27`	`27`
Original file line number	Diff line number	Diff line change
`@@ -21,11 +21,11 @@ terraform {`
`21`	`21`	`required_providers {`
`22`	`22`	`google = {`
`23`	`23`	`source = "hashicorp/google"`
`24`		`- version = ">= 6.42.0, < 7"`
	`24`	`+ version = ">= 6.42.0, < 8"`
`25`	`25`	`}`
`26`	`26`	`google-beta = {`
`27`	`27`	`source = "hashicorp/google-beta"`
`28`		`- version = ">= 6.42.0, < 7"`
	`28`	`+ version = ">= 6.42.0, < 8"`
`29`	`29`	`}`
`30`	`30`	`kubernetes = {`
`31`	`31`	`source = "hashicorp/kubernetes"`