Skip to content

Commit d3f87c8

Browse files
committed
Added logic for deleting ALL old policy bindings
1 parent 3499c3a commit d3f87c8

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

deploy/setup-project.sh

+9-9
Original file line numberDiff line numberDiff line change
@@ -12,24 +12,24 @@ IAM_NAME="${GCEPD_SA_NAME}@${PROJECT}.iam.gserviceaccount.com"
1212
# Create or Update Custom Role
1313
if gcloud iam roles describe gcp_compute_persistent_disk_csi_driver_custom_role --project "${PROJECT}";
1414
then
15-
yes | gcloud iam roles update gcp_compute_persistent_disk_csi_driver_custom_role \
16-
--project "${PROJECT}" \
15+
gcloud iam roles update gcp_compute_persistent_disk_csi_driver_custom_role --quiet \
16+
--project "${PROJECT}" \
1717
--file "${PKGDIR}/deploy/gcp-compute-persistent-disk-csi-driver-custom-role.yaml"
1818
else
19-
gcloud iam roles create gcp_compute_persistent_disk_csi_driver_custom_role \
20-
--project "${PROJECT}" \
19+
gcloud iam roles create gcp_compute_persistent_disk_csi_driver_custom_role --quiet \
20+
--project "${PROJECT}" \
2121
--file "${PKGDIR}/deploy/gcp-compute-persistent-disk-csi-driver-custom-role.yaml"
2222
fi
2323

2424
# Delete Service Account Key
2525
if [ -f $SA_FILE ]; then
2626
rm "$SA_FILE"
2727
fi
28-
# Delete Bindings
29-
for role in ${BIND_ROLES}
30-
do
31-
gcloud projects remove-iam-policy-binding "${PROJECT}" --member serviceAccount:"${IAM_NAME}" --role $role --quiet || true
32-
done
28+
# Delete ALL EXISTING Bindings
29+
gcloud projects get-iam-policy "${PROJECT}" --format json > "${PKGDIR}/deploy/iam.json"
30+
sed -i "/${IAM_NAME}/d" "${PKGDIR}/deploy/iam.json"
31+
gcloud projects set-iam-policy "${PROJECT}" "${PKGDIR}/deploy/iam.json"
32+
rm -f "${PKGDIR}/deploy/iam.json"
3333
# Delete Service Account
3434
gcloud iam service-accounts delete "$IAM_NAME" --quiet || true
3535

0 commit comments

Comments
 (0)