Skip to content

gcp/bash/prod: ensure gcs logs for prod buckets #2680

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
k8s-ci-robot merged 1 commit into from
Sep 9, 2021
Merged

gcp/bash/prod: ensure gcs logs for prod buckets #2680

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
36 changes: 19 additions & 17 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 @@ -102,24 +102,23 @@ function ensure_prod_gcr() {
fi
local project="${1}"

color 6 "Ensuring the GCR exists and is readable"
for r in "${PROD_REGIONS[@]}"; do
color 3 "region $r"
ensure_gcr_repo "${project}" "${r}"
done 2>&1 | indent

color 6 "Empowering GCR admins"
for r in "${PROD_REGIONS[@]}"; do
color 3 "region $r"
empower_gcr_admins "${project}" "${r}"
color 6 "Ensuring prod GCR for regions: ${PROD_REGIONS[*]}"
for region in "${PROD_REGIONS[@]}"; do
local gcr_bucket="gs://${region}.artifacts.${project}.appspot.com"

color 3 "region: ${region}"
color 6 "Ensuring a GCR repo exists in region: ${region} for project: ${project}"
ensure_gcr_repo "${project}" "${region}"

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_artifact_promoter "${project}" "${region}"

color 6 "Ensuring GCS access logs enabled for GCR bucket in region: ${region} in project: ${project}"
ensure_gcs_bucket_logging "${gcr_bucket}"
Comment on lines +119 to +120
Copy link
Copy Markdown
Contributor Author

@spiffxp spiffxp Sep 9, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the addition that matters for the GCR repo, the rest of this diff is merging the three regional loops into one

done 2>&1 | indent

color 6 "Empowering image promoter"
for r in "${PROD_REGIONS[@]}"; do
color 3 "region $r"
empower_artifact_promoter "${project}" "${r}"
done 2>&1 | indent

}

# Make a prod GCS bucket and grant access to it. We need whole buckets for
Expand Down Expand Up @@ -149,6 +148,9 @@ function ensure_prod_gcs_bucket() {
color 6 "Empowering GCS admins"
empower_gcs_admins "${project}" "${bucket}"

color 6 "Ensuring GCS access logs enabled for ${bucket} in project: ${project}"
ensure_gcs_bucket_logging "${bucket}"

if [ -n "${group}" ]; then
color 6 "Empowering ${group} to write to the bucket"
empower_group_to_write_gcs_bucket "${group}" "${bucket}"
Expand Down