Merge branch 'main' into private-cluster-node-pool

ciroclover · web-flow · commit 858db8d9b134 · 2025-08-20T08:06:28.000-04:00
diff --git a/Makefile b/Makefile
@@ -76,13 +76,14 @@ 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 display'
+		/bin/bash -c 'source /usr/local/bin/task_helper_functions.sh && generate_docs --per-module-requirements'
 
 # Generate files from autogen
 .PHONY: docker_generate_modules
diff --git a/examples/gke_autopilot_cluster/main.tf b/examples/gke_autopilot_cluster/main.tf
@@ -33,7 +33,8 @@ provider "kubernetes" {
 }
 
 module "gke" {
-  source = "ciroclover/kubernetes-engine/google//modules/gke-autopilot-cluster"
+  source = "terraform-google-modules/kubernetes-engine/google//modules/gke-autopilot-cluster"
+  
 
   project    = var.project_id
   name       = "${local.cluster_type}-cluster"
diff --git a/examples/gke_standard_cluster/main.tf b/examples/gke_standard_cluster/main.tf
@@ -34,7 +34,7 @@ data "google_compute_subnetwork" "subnetwork" {
 }
 
 module "gke" {
-  source = "ciroclover/kubernetes-engine/google//modules/gke-standard-cluster"
+  source = "terraform-google-modules/kubernetes-engine/google//modules/gke-standard-cluster"
 
   project    = var.project_id
   name       = "${local.cluster_type}-cluster${var.cluster_name_suffix}"
@@ -83,7 +83,7 @@ module "gke" {
 }
 
 module "node_pool" {
-  source = "ciroclover/kubernetes-engine/google//modules/gke-node-pool"
+  source = "terraform-google-modules/kubernetes-engine/google//modules/gke-node-pool"
 
   project  = var.project_id
   location = var.region
diff --git a/metadata.yaml b/metadata.yaml
@@ -819,3 +819,15 @@ spec:
         description: Whether vertical pod autoscaling enabled
       - name: zones
         description: List of zones in which the cluster resides
+  requirements:
+    roles:
+      - level: Project
+        roles:
+          - roles/editor
+    providerVersions:
+      - source: hashicorp/google
+        version: ">= 6.42.0, < 7"
+      - source: hashicorp/kubernetes
+        version: ~> 2.10
+      - source: hashicorp/random
+        version: ">= 2.1"
diff --git a/modules/auth/metadata.yaml b/modules/auth/metadata.yaml
@@ -151,3 +151,11 @@ spec:
         description: A kubeconfig file configured to access the GKE cluster.
       - name: token
         description: The token value for use with the kubernetes provider.
+  requirements:
+    roles:
+      - level: Project
+        roles:
+          - roles/editor
+    providerVersions:
+      - source: hashicorp/google
+        version: ">= 4.47.0, != 4.49.0, != 4.50.0, < 7"
diff --git a/modules/beta-autopilot-private-cluster/metadata.yaml b/modules/beta-autopilot-private-cluster/metadata.yaml
@@ -562,3 +562,17 @@ spec:
         description: Whether vertical pod autoscaling enabled
       - name: zones
         description: List of zones in which the cluster resides
+  requirements:
+    roles:
+      - level: Project
+        roles:
+          - roles/editor
+    providerVersions:
+      - source: hashicorp/google
+        version: ">= 6.42.0, < 7"
+      - source: hashicorp/google-beta
+        version: ">= 6.42.0, < 7"
+      - source: hashicorp/kubernetes
+        version: ~> 2.10
+      - source: hashicorp/random
+        version: ">= 2.1"
diff --git a/modules/beta-autopilot-public-cluster/metadata.yaml b/modules/beta-autopilot-public-cluster/metadata.yaml
@@ -536,3 +536,17 @@ spec:
         description: Whether vertical pod autoscaling enabled
       - name: zones
         description: List of zones in which the cluster resides
+  requirements:
+    roles:
+      - level: Project
+        roles:
+          - roles/editor
+    providerVersions:
+      - source: hashicorp/google
+        version: ">= 6.42.0, < 7"
+      - source: hashicorp/google-beta
+        version: ">= 6.42.0, < 7"
+      - source: hashicorp/kubernetes
+        version: ~> 2.10
+      - source: hashicorp/random
+        version: ">= 2.1"
diff --git a/modules/beta-private-cluster-update-variant/metadata.yaml b/modules/beta-private-cluster-update-variant/metadata.yaml
@@ -854,3 +854,17 @@ spec:
         description: Whether vertical pod autoscaling enabled
       - name: zones
         description: List of zones in which the cluster resides
+  requirements:
+    roles:
+      - level: Project
+        roles:
+          - roles/editor
+    providerVersions:
+      - source: hashicorp/google
+        version: ">= 6.42.0, < 7"
+      - source: hashicorp/google-beta
+        version: ">= 6.42.0, < 7"
+      - source: hashicorp/kubernetes
+        version: ~> 2.10
+      - source: hashicorp/random
+        version: ">= 2.1"
diff --git a/modules/beta-private-cluster/metadata.yaml b/modules/beta-private-cluster/metadata.yaml
@@ -854,3 +854,17 @@ spec:
         description: Whether vertical pod autoscaling enabled
       - name: zones
         description: List of zones in which the cluster resides
+  requirements:
+    roles:
+      - level: Project
+        roles:
+          - roles/editor
+    providerVersions:
+      - source: hashicorp/google
+        version: ">= 6.42.0, < 7"
+      - source: hashicorp/google-beta
+        version: ">= 6.42.0, < 7"
+      - source: hashicorp/kubernetes
+        version: ~> 2.10
+      - source: hashicorp/random
+        version: ">= 2.1"
diff --git a/modules/beta-public-cluster-update-variant/metadata.yaml b/modules/beta-public-cluster-update-variant/metadata.yaml
@@ -828,3 +828,17 @@ spec:
         description: Whether vertical pod autoscaling enabled
       - name: zones
         description: List of zones in which the cluster resides
+  requirements:
+    roles:
+      - level: Project
+        roles:
+          - roles/editor
+    providerVersions:
+      - source: hashicorp/google
+        version: ">= 6.42.0, < 7"
+      - source: hashicorp/google-beta
+        version: ">= 6.42.0, < 7"
+      - source: hashicorp/kubernetes
+        version: ~> 2.10
+      - source: hashicorp/random
+        version: ">= 2.1"
diff --git a/modules/beta-public-cluster/metadata.yaml b/modules/beta-public-cluster/metadata.yaml
@@ -828,3 +828,17 @@ spec:
         description: Whether vertical pod autoscaling enabled
       - name: zones
         description: List of zones in which the cluster resides
+  requirements:
+    roles:
+      - level: Project
+        roles:
+          - roles/editor
+    providerVersions:
+      - source: hashicorp/google
+        version: ">= 6.42.0, < 7"
+      - source: hashicorp/google-beta
+        version: ">= 6.42.0, < 7"
+      - source: hashicorp/kubernetes
+        version: ~> 2.10
+      - source: hashicorp/random
+        version: ">= 2.1"
diff --git a/modules/binary-authorization/metadata.yaml b/modules/binary-authorization/metadata.yaml
@@ -155,3 +155,13 @@ spec:
         description: Name of the built attestor
       - name: key
         description: Name of the Key created for the attestor
+  requirements:
+    roles:
+      - level: Project
+        roles:
+          - roles/editor
+    providerVersions:
+      - source: hashicorp/google
+        version: < 7
+      - source: hashicorp/google-beta
+        version: < 7
diff --git a/modules/fleet-app-operator-permissions/metadata.yaml b/modules/fleet-app-operator-permissions/metadata.yaml
@@ -153,3 +153,15 @@ spec:
         description: The project to which the Fleet belongs.
       - name: wait
         description: An output to use when you want to depend on Scope RBAC Role Binding creation finishing.
+  requirements:
+    roles:
+      - level: Project
+        roles:
+          - roles/editor
+    providerVersions:
+      - source: hashicorp/google
+        version: ">= 6.39.0"
+      - source: hashicorp/google-beta
+        version: ">= 6.39.0"
+      - source: hashicorp/random
+        version: ">= 2.0.0"
diff --git a/modules/fleet-membership/metadata.yaml b/modules/fleet-membership/metadata.yaml
@@ -163,3 +163,13 @@ spec:
         description: The project of the hub membership.
       - name: wait
         description: An output to use when you want to depend on registration finishing
+  requirements:
+    roles:
+      - level: Project
+        roles:
+          - roles/editor
+    providerVersions:
+      - source: hashicorp/google
+        version: ">= 5.6.0, < 7"
+      - source: hashicorp/google-beta
+        version: ">= 5.6.0, < 7"
diff --git a/modules/gke-autopilot-cluster/metadata.display.yaml b/modules/gke-autopilot-cluster/metadata.display.yaml
@@ -15,7 +15,7 @@
 apiVersion: blueprints.cloud.google.com/v1alpha1
 kind: BlueprintMetadata
 metadata:
-  name: terraform-google-kubernetes-engine-gke-autopilot-private-cluster-display
+  name: terraform-google-kubernetes-engine-gke-autopilot-cluster-display
   annotations:
     config.kubernetes.io/local-config: "true"
 spec:
@@ -64,9 +64,6 @@ spec:
         datapath_provider:
           name: datapath_provider
           title: Datapath Provider
-        default_max_pods_per_node:
-          name: default_max_pods_per_node
-          title: Default Max Pods Per Node
         default_snat_status:
           name: default_snat_status
           title: Default Snat Status
@@ -88,30 +85,15 @@ spec:
         enable_fqdn_network_policy:
           name: enable_fqdn_network_policy
           title: Enable Fqdn Network Policy
-        enable_intranode_visibility:
-          name: enable_intranode_visibility
-          title: Enable Intranode Visibility
         enable_k8s_beta_apis:
           name: enable_k8s_beta_apis
           title: Enable K8s Beta Apis
-        enable_kubernetes_alpha:
-          name: enable_kubernetes_alpha
-          title: Enable Kubernetes Alpha
         enable_l4_ilb_subsetting:
           name: enable_l4_ilb_subsetting
           title: Enable L4 Ilb Subsetting
-        enable_legacy_abac:
-          name: enable_legacy_abac
-          title: Enable Legacy Abac
         enable_multi_networking:
           name: enable_multi_networking
           title: Enable Multi Networking
-        enable_shielded_nodes:
-          name: enable_shielded_nodes
-          title: Enable Shielded Nodes
-        enable_tpu:
-          name: enable_tpu
-          title: Enable Tpu
         enterprise_config:
           name: enterprise_config
           title: Enterprise Config
@@ -136,9 +118,6 @@ spec:
         logging_config:
           name: logging_config
           title: Logging Config
-        logging_service:
-          name: logging_service
-          title: Logging Service
         maintenance_policy:
           name: maintenance_policy
           title: Maintenance Policy
@@ -157,36 +136,18 @@ spec:
         monitoring_config:
           name: monitoring_config
           title: Monitoring Config
-        monitoring_service:
-          name: monitoring_service
-          title: Monitoring Service
         name:
           name: name
           title: Name
         network:
           name: network
           title: Network
-        network_policy:
-          name: network_policy
-          title: Network Policy
-        networking_mode:
-          name: networking_mode
-          title: Networking Mode
-        node_config:
-          name: node_config
-          title: Node Config
         node_locations:
           name: node_locations
           title: Node Locations
         node_pool_auto_config:
           name: node_pool_auto_config
           title: Node Pool Auto Config
-        node_pool_defaults:
-          name: node_pool_defaults
-          title: Node Pool Defaults
-        node_version:
-          name: node_version
-          title: Node Version
         notification_config:
           name: notification_config
           title: Notification Config
@@ -223,9 +184,6 @@ spec:
         security_posture_config:
           name: security_posture_config
           title: Security Posture Config
-        service_account:
-          name: service_account
-          title: Service Account
         service_external_ips_config:
           name: service_external_ips_config
           title: Service External Ips Config
diff --git a/modules/gke-autopilot-cluster/metadata.yaml b/modules/gke-autopilot-cluster/metadata.yaml
@@ -15,7 +15,7 @@
 apiVersion: blueprints.cloud.google.com/v1alpha1
 kind: BlueprintMetadata
 metadata:
-  name: terraform-google-kubernetes-engine-gke-autopilot-private-cluster
+  name: terraform-google-kubernetes-engine-gke-autopilot-cluster
   annotations:
     config.kubernetes.io/local-config: "true"
 spec:
@@ -565,3 +565,11 @@ spec:
         description: Whether Secret Manager add-on is enabled
       - name: vertical_pod_autoscaling_enabled
         description: Whether vertical pod autoscaling enabled
+  requirements:
+    roles:
+      - level: Project
+        roles:
+          - roles/editor
+    providerVersions:
+      - source: hashicorp/google-beta
+        version: ">= 6.33.0, < 7"
diff --git a/modules/gke-node-pool/metadata.display.yaml b/modules/gke-node-pool/metadata.display.yaml
@@ -73,9 +73,6 @@ spec:
         project:
           name: project
           title: Project
-        queue_provisioning:
-          name: queue_provisioning
-          title: Queue Provisioning
         queued_provisioning:
           name: queued_provisioning
           title: Queued Provisioning
diff --git a/modules/gke-node-pool/metadata.yaml b/modules/gke-node-pool/metadata.yaml
@@ -399,3 +399,11 @@ spec:
         description: The resource URLs of the managed instance groups associated with this node pool.
       - name: managed_instance_group_urls
         description: List of instance group URLs which have been assigned to this node pool.
+  requirements:
+    roles:
+      - level: Project
+        roles:
+          - roles/editor
+    providerVersions:
+      - source: hashicorp/google-beta
+        version: ">= 6.33.0, < 7"
diff --git a/modules/gke-standard-cluster/metadata.display.yaml b/modules/gke-standard-cluster/metadata.display.yaml
@@ -15,7 +15,7 @@
 apiVersion: blueprints.cloud.google.com/v1alpha1
 kind: BlueprintMetadata
 metadata:
-  name: terraform-google-kubernetes-engine-gke-private-cluster-display
+  name: terraform-google-kubernetes-engine-gke-standard-cluster-display
   annotations:
     config.kubernetes.io/local-config: "true"
 spec:
@@ -169,9 +169,6 @@ spec:
         network_policy:
           name: network_policy
           title: Network Policy
-        networking_mode:
-          name: networking_mode
-          title: Networking Mode
         node_config:
           name: node_config
           title: Node Config
diff --git a/modules/gke-standard-cluster/metadata.yaml b/modules/gke-standard-cluster/metadata.yaml
diff --git a/modules/hub-legacy/metadata.yaml b/modules/hub-legacy/metadata.yaml
diff --git a/modules/private-cluster-update-variant/metadata.yaml b/modules/private-cluster-update-variant/metadata.yaml
diff --git a/modules/private-cluster/metadata.yaml b/modules/private-cluster/metadata.yaml
diff --git a/modules/safer-cluster-update-variant/metadata.yaml b/modules/safer-cluster-update-variant/metadata.yaml
diff --git a/modules/safer-cluster/metadata.yaml b/modules/safer-cluster/metadata.yaml
diff --git a/modules/workload-identity/metadata.yaml b/modules/workload-identity/metadata.yaml
diff --git a/test/setup/iam.tf b/test/setup/iam.tf
diff --git a/test/setup/main.tf b/test/setup/main.tf

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,8 @@ provider "kubernetes" {`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`module "gke" {`
`36`		`- source = "ciroclover/kubernetes-engine/google//modules/gke-autopilot-cluster"`
	`36`	`+ source = "terraform-google-modules/kubernetes-engine/google//modules/gke-autopilot-cluster"`
	`37`	`+`
`37`	`38`
`38`	`39`	`project = var.project_id`
`39`	`40`	`name = "${local.cluster_type}-cluster"`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ data "google_compute_subnetwork" "subnetwork" {`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`module "gke" {`
`37`		`- source = "ciroclover/kubernetes-engine/google//modules/gke-standard-cluster"`
	`37`	`+ source = "terraform-google-modules/kubernetes-engine/google//modules/gke-standard-cluster"`
`38`	`38`
`39`	`39`	`project = var.project_id`
`40`	`40`	`name = "${local.cluster_type}-cluster${var.cluster_name_suffix}"`
`@@ -83,7 +83,7 @@ module "gke" {`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`module "node_pool" {`
`86`		`- source = "ciroclover/kubernetes-engine/google//modules/gke-node-pool"`
	`86`	`+ source = "terraform-google-modules/kubernetes-engine/google//modules/gke-node-pool"`
`87`	`87`
`88`	`88`	`project = var.project_id`
`89`	`89`	`location = var.region`