Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ensure prow-build can operate secret manager secrets #7416

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion infra/gcp/bash/prow/ensure-e2e-projects.sh
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,8 @@ function ensure_e2e_project() {
file.googleapis.com \
logging.googleapis.com \
monitoring.googleapis.com \
storage-component.googleapis.com
storage-component.googleapis.com \
secretmanager.googleapis.com
dargudear-google marked this conversation as resolved.
Show resolved Hide resolved

# TODO: this is what prow.k8s.io uses today, but seems overprivileged, we
# could consider using a more limited custom IAM role instead
Expand Down Expand Up @@ -112,6 +113,17 @@ function ensure_e2e_project() {
"serviceAccount:${PROW_BUILD_SVCACCT}" \
"roles/iam.serviceAccountUser"

# Ensure GCP Default Compute Service Account can administer Secret Manager secrets
ensure_project_role_binding "${prj}" \
"serviceAccount:${PROW_BUILD_SVCACCT}" \
"roles/secretmanager.admin"

# Ensure GCP Default Compute Engine Service Agent Account can manage Secret Manager Secrets
ensure_project_role_binding "${prj}" \
"serviceAccount:service-${project_number}@compute-system.iam.gserviceaccount.com" \
"roles/secretmanager.admin"
dargudear-google marked this conversation as resolved.
Show resolved Hide resolved


# TODO: this is what prow.k8s.io uses today, but seems overprivileged, we
# could consider using a more limited custom IAM role instead
color 6 "Empower boskos-janitor service account to clean e2e project: ${prj}"
Expand Down
3 changes: 2 additions & 1 deletion infra/gcp/terraform/k8s-infra-prow/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ module "project" {
"certificatemanager.googleapis.com",
"artifactregistry.googleapis.com",
"secretmanager.googleapis.com",
"cloudbuild.googleapis.com"
"cloudbuild.googleapis.com",
"secretmanager.googleapis.com",
dargudear-google marked this conversation as resolved.
Show resolved Hide resolved
]
}