Skip to content
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

Jump to bottom

DAOSGCP-96 Add functionality to check GCP permission before adding them #34

Merged
merged 2 commits into from
Apr 22, 2022
Merged

DAOSGCP-96 Add functionality to check GCP permission before adding them #34

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6a73c73
DAOSGCP-96 Add functionality to check GCP permission before adding them
lsitkiew Apr 21, 2022
33cfb9a
Update variable names
lsitkiew Apr 22, 2022
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
31 changes: 24 additions & 7 deletions images/build_images.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,13 +242,31 @@ configure_gcp_project() {
log "Packer will be using service account ${CLOUD_BUILD_ACCOUNT}"

# Add cloudbuild SA permissions
gcloud projects add-iam-policy-binding "${GCP_PROJECT}" \
--member "${CLOUD_BUILD_ACCOUNT}" \
--role roles/compute.instanceAdmin.v1
CHECK_ROLE_INST_ADMIN=$(
gcloud projects get-iam-policy "${GCP_PROJECT}" \
--flatten="bindings[].members" \
--filter="bindings.role=roles/compute.instanceAdmin.v1 AND \
bindings.members=${CLOUD_BUILD_ACCOUNT}" \
--format="value(bindings.members[])"
)
if [[ "${CHECK_ROLE_INST_ADMIN}" != "${CLOUD_BUILD_ACCOUNT}" ]]; then
gcloud projects add-iam-policy-binding "${GCP_PROJECT}" \
--member "${CLOUD_BUILD_ACCOUNT}" \
--role roles/compute.instanceAdmin.v1
fi

gcloud projects add-iam-policy-binding "${GCP_PROJECT}" \
--member "${CLOUD_BUILD_ACCOUNT}" \
--role roles/iam.serviceAccountUser
CHECK_ROLE_SVC_ACCT=$(
gcloud projects get-iam-policy "${GCP_PROJECT}" \
--flatten="bindings[].members" \
--filter="bindings.role=roles/iam.serviceAccountUser AND \
bindings.members=${CLOUD_BUILD_ACCOUNT}" \
--format="value(bindings.members[])"
)
if [[ "${CHECK_ROLE_SVC_ACCT}" != "${CLOUD_BUILD_ACCOUNT}" ]]; then
gcloud projects add-iam-policy-binding "${GCP_PROJECT}" \
--member "${CLOUD_BUILD_ACCOUNT}" \
--role roles/iam.serviceAccountUser
fi

FWRULENAME="gcp-cloudbuild-ssh"

Expand Down Expand Up @@ -313,4 +331,3 @@ main() {
}

main "$@"