Skip to content

gcp/bash: fix various typos for ensure-prod-storage.sh #4070

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Aug 11, 2022
Merged

gcp/bash: fix various typos for ensure-prod-storage.sh #4070

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions infra/gcp/bash/ensure-prod-storage.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ readonly PROD_PROJECT_DISABLED_SERVICES=(
# Regions for prod GCR.
GCR_PROD_REGIONS=(us eu asia)
# Regions for prod AR.
AR_PROD_REGIONS=(asia-east1 asia-south1 asia-northeast1 asia-northeast2 australia-southeast1 europe-north1 europe-southeast1 europe-west1 europe-west2 europe-west4 europe-west8 europe-west9 southamerica-west1 us-central1 us-east1 us-east4 us-east5 us-south1 us-west1 us-west2)
AR_PROD_REGIONS=(asia-east1 asia-south1 asia-northeast1 asia-northeast2 australia-southeast1 europe-north1 europe-southwest1 europe-west1 europe-west2 europe-west4 europe-west8 europe-west9 southamerica-west1 us-central1 us-east1 us-east4 us-east5 us-south1 us-west1 us-west2)

# Minimum time we expect to keep prod GCS artifacts.
PROD_RETENTION="10y"
Expand All @@ -116,7 +116,7 @@ function ensure_prod_gcr() {

color 6 "Ensuring GCR admins can admin GCR in region: ${region} for project: ${project}"
empower_gcr_admins "${project}" "${region}"

color 6 "Empowering image promoter for region: ${region} in project: ${project}"
empower_image_promoter "${project}" "${region}"

Expand Down Expand Up @@ -145,10 +145,10 @@ function ensure_prod_ar() {

color 6 "Ensuring GCR admins can admin AR in location: ${region} for project: ${project}"
empower_ar_admins "${project}" "${region}"

color 6 "Empowering image promoter with roles/artifactregistry.repoAdmin in project: ${project}"
serviceaccount=$(svc_acct_email "${project}" "${IMAGE_PROMOTER_SVCACCT}")
ensure_project_role_binding "${project}" "serviceAccount:$serviceaccount" "artifactregistry.repoAdmin"
ensure_project_role_binding "${project}" "serviceAccount:$serviceaccount" "roles/artifactregistry.repoAdmin"
done 2>&1 | indent
}

Expand Down Expand Up @@ -399,7 +399,7 @@ function ensure_all_prod_special_cases() {
color 6 "Ensuring GKE clusters in '${project}' can run pods in '${PROWJOB_POD_NAMESPACE}' as '${serviceaccount}'"
empower_gke_for_serviceaccount \
"${project}" "${PROWJOB_POD_NAMESPACE}" \
"${serviceaccount}" "k8s-infra-gcr-vuln-scanning"
"${serviceaccount}" "k8s-infra-gcr-vuln-scanning"
done

# For write access to:
Expand Down
6 changes: 3 additions & 3 deletions infra/gcp/bash/lib_ar.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ function empower_group_to_write_ar() {
local project="$2"
local location="$3"

ensure_repository_role_binding "images" "${group}" "artifactregistry.repoAdmin" "${project}" "${location}"
ensure_ar_repository_role_binding "images" "${group}" "roles/artifactregistry.repoAdmin" "${project}" "${location}"
}

function ensure_public_ar_registry() {
Expand All @@ -45,7 +45,7 @@ function ensure_public_ar_registry() {
local project="$1"
local location="$2"

ensure_repository_role_binding "images" "allUsers" "artifactregistry.reader" "${project}" "${location}"
ensure_ar_repository_role_binding "images" "allUsers" "roles/artifactregistry.reader" "${project}" "${location}"
}

function empower_ar_admins() {
Expand All @@ -57,7 +57,7 @@ function empower_ar_admins() {
local project="$1"
local location="$2"

ensure_repository_role_binding "images" "group:${GCR_ADMINS}" "artifactregistry.admin" "${project}" "${location}"
ensure_ar_repository_role_binding "images" "group:${GCR_ADMINS}" "roles/artifactregistry.admin" "${project}" "${location}"
}

# Ensure the AR registry exists and is world-readable.
Expand Down