From 626e961c6a9bf6da4efde09e0b5a21e47e51a309 Mon Sep 17 00:00:00 2001 From: Andrew Peabody Date: Fri, 29 Aug 2025 16:50:33 +0000 Subject: [PATCH 1/2] chore(metadata): multiple args now supported by dev-tools --- Makefile | 2 +- modules/gke-node-pool/metadata.yaml | 2 +- modules/gke-standard-cluster/metadata.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index d85170f0e2..f65d12ab48 100644 --- a/Makefile +++ b/Makefile @@ -83,7 +83,7 @@ docker_generate_docs: -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/modules/gke-node-pool/metadata.yaml b/modules/gke-node-pool/metadata.yaml index 86d1200ce3..cd29dee409 100644 --- a/modules/gke-node-pool/metadata.yaml +++ b/modules/gke-node-pool/metadata.yaml @@ -403,9 +403,9 @@ spec: roles: - level: Project roles: + - roles/compute.admin - roles/container.admin - roles/iam.serviceAccountUser - - roles/compute.admin services: - compute.googleapis.com - container.googleapis.com diff --git a/modules/gke-standard-cluster/metadata.yaml b/modules/gke-standard-cluster/metadata.yaml index dc67120a3b..3279346661 100644 --- a/modules/gke-standard-cluster/metadata.yaml +++ b/modules/gke-standard-cluster/metadata.yaml @@ -1008,9 +1008,9 @@ spec: roles: - level: Project roles: + - roles/iam.serviceAccountUser - roles/compute.admin - roles/container.admin - - roles/iam.serviceAccountUser services: - compute.googleapis.com - container.googleapis.com From 80bfc53dc4ac17d41ffaad73d8aa0e3e888a41b4 Mon Sep 17 00:00:00 2001 From: Andrew Peabody Date: Fri, 29 Aug 2025 10:17:23 -0700 Subject: [PATCH 2/2] Update Makefile --- Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/Makefile b/Makefile index f65d12ab48..064066a418 100644 --- a/Makefile +++ b/Makefile @@ -76,7 +76,6 @@ 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 \