Merge pull request #1119 from artemvmin/fix-kms-permissions

Fix kms permissions for local e2e tests

Author: k8s-ci-robot

deploy/setup-project.sh

@@ -13,7 +13,8 @@
 # PROJECT: GCP project
 # GCE_PD_SA_NAME: Name of the service account to create
 # GCE_PD_SA_DIR: Directory to save the service account key
-# ENABLE_KMS: If true, it will enable Cloud KMS and configure IAM ACLs.
+# ENABLE_KMS: Enable Cloud KMS and configure IAM ACLs.
+# ENABLE_KMS_ADMIN: Add service account permissions to destroy Cloud KMS keys.
 # CREATE_SA_KEY: (Optional) If true, creates a new service account key and
 #   exports it if creating a new service account
 
@@ -27,6 +28,7 @@ source "${PKGDIR}/deploy/common.sh"
 ensure_var PROJECT
 ensure_var GCE_PD_SA_NAME
 ensure_var ENABLE_KMS
+ensure_var ENABLE_KMS_ADMIN
 
 # Allow the user to pass CREATE_SA_KEY=false to skip the SA key creation
 # Ensure the SA directory set, if we're creating the SA_KEY
@@ -35,9 +37,8 @@ if [ "${CREATE_SA_KEY}" = true ]; then
   ensure_var GCE_PD_SA_DIR
 fi
 
-# If the project id includes the org name in the format "org-name:project", the
-# gCloud api will format the project part of the iam email domain as
-# "project.org-name"
+# If the project ID includes the org name in the format "org-name:project",
+# gcloud will format the project in the IAM email domain as "project.org-name"
 if [[ $PROJECT == *":"* ]]; then
   IFS=':' read -ra SPLIT <<< "$PROJECT"
   readonly IAM_PROJECT="${SPLIT[1]}.${SPLIT[0]}"
@@ -90,14 +91,13 @@ fi
 # Create or Update Custom Role
 if gcloud iam roles describe gcp_compute_persistent_disk_csi_driver_custom_role --project "${PROJECT}";
 then
-  gcloud iam roles update gcp_compute_persistent_disk_csi_driver_custom_role --quiet \
-		  --project "${PROJECT}"                                                     \
-		  --file "${PKGDIR}/deploy/gcp-compute-persistent-disk-csi-driver-custom-role.yaml"
+  action=update
 else
-  gcloud iam roles create gcp_compute_persistent_disk_csi_driver_custom_role --quiet \
-	--project "${PROJECT}"                                                           \
-	--file "${PKGDIR}/deploy/gcp-compute-persistent-disk-csi-driver-custom-role.yaml"
+  action=create
 fi
+gcloud iam roles $action gcp_compute_persistent_disk_csi_driver_custom_role --quiet \
+	--project "${PROJECT}"                                                     \
+	--file "${PKGDIR}/deploy/gcp-compute-persistent-disk-csi-driver-custom-role.yaml"
 
 # Bind service account to roles
 for role in ${BIND_ROLES}
@@ -113,6 +113,13 @@ then
   gcloud projects add-iam-policy-binding "${PROJECT}" --member serviceAccount:"service-${PROJECT_NUMBER}@compute-system.iam.gserviceaccount.com" --role "roles/cloudkms.cryptoKeyEncrypterDecrypter"
 fi
 
+# Authorize SA to destroy Cloud KMS encryption keys.
+if [ "${ENABLE_KMS_ADMIN}" = true ];
+then
+  gcloud services enable cloudkms.googleapis.com --project="${PROJECT}"
+  gcloud projects add-iam-policy-binding "${PROJECT}" --member serviceAccount:"${IAM_NAME}" --role "roles/cloudkms.admin"
+fi
+
 # Export key if needed
 if [ "${CREATE_SA}" = true ] && [ "${CREATE_SA_KEY}" = true ];
 then

docs/kubernetes/development.md

@@ -48,11 +48,12 @@ To create a service account with correct permissions, your test project must:
     [Role Administrator](https://cloud.google.com/iam/docs/understanding-roles#iam.roleAdmin)
     IAM roles.
 2.  Be part of an organization that allows creation of service account keys.
-    -   Google developer projects restrict SA keys and will not work for E2E
-        testing.
+    -   For example, a Google internal developer project will not work for E2E
+        testing because the org restricts SA key creation.
 
 ```sh
-export ENABLE_KMS=false
+export ENABLE_KMS=true
+export ENABLE_KMS_ADMIN=true
 ./deploy/setup-project.sh
 ```