Merge pull request #2813 from spiffxp/staging-special-case-services

bash/staging: prune unexpected services

infra/gcp/bash/ensure-staging-storage.sh

@@ -136,10 +136,17 @@ function ensure_staging_project() {
 
     # Enable services for staging projects and their direct dependencies; prune anything else
     color 6 "Ensuring necessary enabled services staging project: ${project}"
-    # TODO: this may eventually disable other services; for now it
-    #       only does so if an obnoxiously long environment var is set,
-    #       K8S_INFRA_ENSURE_ONLY_SERVICES_WILL_FORCE_DISABLE=true
-    ensure_only_services "${project}" "${STAGING_PROJECT_SERVICES[@]}"
+    # NOTE: horrible bash to allow special cases of staging projects needing
+    #       more services than the default set... since bash doesn't let us
+    #       pass around arrays, wrap an array in a function that echoes it,
+    #       and append the output of that function to the default set
+    local special_case_services="staging_special_case_services__${project//-/_}"
+    local enabled_services=("${STAGING_PROJECT_SERVICES[@]}")
+    if [ "$(type -t "${special_case_services}")" == "function" ]; then
+        mapfile -t -O "${#enabled_services[@]}" enabled_services < <(${special_case_services})
+    fi
+    K8S_INFRA_ENSURE_ONLY_SERVICES_WILL_FORCE_DISABLE=true \
+      ensure_only_services "${project}" "${enabled_services[@]}"
 
     color 6 "Ensuring disabled services for staging project: ${project}"
     ensure_disabled_services "${project}" "${STAGING_PROJECT_DISABLED_SERVICES[@]}"
@@ -377,28 +384,27 @@ function staging_special_case__k8s_staging_ci_images() {
     empower_svcacct_to_write_gcr "${PROW_BUILD_SERVICE_ACCOUNT}" "k8s-staging-ci-images"
 }
 
-# In order for pull-release-image-* to run on k8s-infra-prow-build,
-# it needs write access to gcr.io/k8s-staging-releng-test. We are
-# wary of what untrusted code is allowed to do, so we don't allow
-# presubmits to run on k8s-infra-prow-build-trusted.
-function staging_special_case__k8s_staging_releng_test() {
-    ensure_staging_gcb_builder_service_account "releng-test" "k8s-infra-prow-build"
-}
-
 # In order to build the node images using image-builder it needs
 # the compute api to be enabled because it will create a VM
 # to build the node image.
+function staging_special_case_services__k8s_staging_cluster_api_gcp() {
+    # needed to build images using packer via image-builder
+    echo compute.googleapis.com
+    # dependency of compute
+    echo oslogin.googleapis.com
+}
 function staging_special_case__k8s_staging_cluster_api_gcp() {
-    readonly STAGING_PROJECT="k8s-staging-cluster-api-gcp"
+    readonly suffix="cluster-api-gcp"
+    readonly project="k8s-staging-${suffix}"
     local serviceaccount
-    serviceaccount="$(svc_acct_email "${STAGING_PROJECT}" "gcb-builder-cluster-api-gcp")"
+    serviceaccount="$(svc_acct_email "${project}" "gcb-builder-cluster-api-gcp")"
 
-    ensure_services "${STAGING_PROJECT}" compute.googleapis.com
-    ensure_project_role_binding "${STAGING_PROJECT}" "serviceAccount:${serviceaccount}" "roles/compute.instanceAdmin.v1"
+    ensure_project_role_binding "${project}" "serviceAccount:${serviceaccount}" "roles/compute.instanceAdmin.v1"
     ensure_serviceaccount_role_binding "${serviceaccount}" "serviceAccount:${serviceaccount}" "roles/iam.serviceAccountUser"
-    ensure_staging_gcb_builder_service_account "cluster-api-gcp" "k8s-infra-prow-build-trusted"
+    ensure_staging_gcb_builder_service_account "${suffix}" "k8s-infra-prow-build-trusted"
 }
 
+
 # In order to build the release artifacts, the group needs to be
 # able to create and manage a keyring to encrypt a secret token
 # that will be accessed and decrypted by a cloud build job.
@@ -419,6 +425,21 @@ function staging_special_case__k8s_staging_kustomize() {
     ensure_project_role_binding "${project}" "${principal}" "roles/secretmanager.secretAccessor"
 }
 
+# In order for pull-release-image-* to run on k8s-infra-prow-build,
+# it needs write access to gcr.io/k8s-staging-releng-test. We are
+# wary of what untrusted code is allowed to do, so we don't allow
+# presubmits to run on k8s-infra-prow-build-trusted.
+function staging_special_case__k8s_staging_releng_test() {
+    ensure_staging_gcb_builder_service_account "releng-test" "k8s-infra-prow-build"
+}
+
+# sig-storage has these enabled
+function staging_special_case_services__k8s_staging_sig_storage() {
+    echo compute.googleapis.com
+    # dependency of compute
+    echo oslogin.googleapis.com
+}
+
 #
 # main
 #