Skip to content

infra/gcp/lib_gcs: fix ensure_gcs_bucket_logging #2283

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 3 commits into from
Jul 1, 2021
Merged

infra/gcp/lib_gcs: fix ensure_gcs_bucket_logging #2283

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6731d48
infra/gcp/lib_gcs: fix ensure_gcs_bucket_logging
spiffxp Jul 1, 2021
c6802b4
infra/gcp/lib_gcs: silence auto-deletion check
spiffxp Jul 1, 2021
7803a66
infra/gcp/staging: no logging for -gcb bucket
spiffxp Jul 1, 2021
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
19 changes: 12 additions & 7 deletions infra/gcp/ensure-staging-storage.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ function ensure_staging_project() {
# Ensure staging project GCS

color 3 "Ensuring staging GCS bucket: ${staging_bucket}"
ensure_staging_gcs_bucket "${project}" "${staging_bucket}" "${writers}" 2>&1 | indent
ensure_staging_gcs_bucket "${project}" "${staging_bucket}" "${writers}" "true" 2>&1 | indent

# Ensure staging project GCB

Expand All @@ -164,19 +164,22 @@ function ensure_staging_project() {

# Ensure the given GCS bucket exists in the given staging project
# with auto-deletion enabled and appropriate permissions for the
# given group and GCS admins
# given group and GCS admins. If an optional fourth parameter is
# set to "true", access logging will be enabled.
#
# $1: The GCP project (e.g. k8s-staging-foo)
# $2: The GCS bucket (e.g. gs://k8s-staging-foo)
# $3: The group to grant write access (e.g. k8s-infra-staging-foo@kubernetes.io)
# [$4:] Enable access logs (e.g. "true", default: false)
function ensure_staging_gcs_bucket() {
if [ $# != 3 ] || [ -z "$1" ] || [ -z "$2" ] || [ -z "$3" ]; then
echo "${FUNCNAME[0]}(project, gcs_bucket, writers) requires 3 arguments" >&2
if [ $# -lt 3 ] || [ -z "$1" ] || [ -z "$2" ] || [ -z "$3" ]; then
echo "${FUNCNAME[0]}(project, gcs_bucket, writers, [logging]) requires at least 3 arguments" >&2
return 1
fi
local project="${1}"
local bucket="${2}"
local writers="${3}"
local logging="${4:-false}"

color 6 "Ensuring ${bucket} exists and is world readable in project: ${project}"
ensure_public_gcs_bucket "${project}" "${bucket}"
Expand All @@ -190,8 +193,10 @@ function ensure_staging_gcs_bucket() {
color 6 "Ensuring ${writers} can write to ${bucket} in project: ${project}"
empower_group_to_write_gcs_bucket "${writers}" "${bucket}"

# Ensure logging is turned on
ensure_gcs_bucket_logging "${bucket}"
if [ "${logging}" == "true" ]; then
color 6 "Ensuring GCS access logs enabled for ${bucket} in project: ${project}"
ensure_gcs_bucket_logging "${bucket}"
fi
}

# Ensure a GCR repo is provisioned in the given staging project, with
Expand Down Expand Up @@ -219,7 +224,7 @@ function ensure_staging_gcr_repo() {
color 6 "Ensuring GCR admins can admin GCR for project: ${project}"
empower_gcr_admins "${project}"

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

Expand Down
6 changes: 3 additions & 3 deletions infra/gcp/lib_gcs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,9 @@ function ensure_gcs_bucket_logging() {

echo "{\"logBucket\": \"${K8S_INFRA_GCSLOGS_BUCKET}\", \"logObjectPrefix\": \"$bucket\"}" > "${intent}"
gsutil logging get "${bucket}"> "${before}"
if ! diff "${intent}" "${before}"; then
if ! diff "${intent}" "${before}" >/dev/null; then
gsutil logging set on -b "${K8S_INFRA_GCSLOGS_BUCKET}" -o "${bucket#gs://}" "${bucket}"
gsutil logging get on -b "${K8S_INFRA_GCSLOGS_BUCKET}" -o "${bucket#gs://}" "${bucket}" > "${after}"
gsutil logging get "${bucket}" > "${after}"
diff_colorized "${before}" "${after}"
fi
}
Expand Down Expand Up @@ -171,7 +171,7 @@ function ensure_gcs_bucket_auto_deletion() {

echo "{\"rule\": [{\"action\": {\"type\": \"Delete\"}, \"condition\": {\"age\": ${auto_deletion_days}}}]}" > "${intent}"
gsutil lifecycle get "${bucket}"> "${before}"
if ! diff "${intent}" "${before}"; then
if ! diff "${intent}" "${before}" >/dev/null; then
gsutil lifecycle set "${intent}" "${bucket}"
gsutil lifecycle get "${bucket}" > "${after}"
diff_colorized "${before}" "${after}"
Expand Down