Skip to content

Commit

Permalink
infra/gcp: remove cleanup of removed bindings/roles
Browse files Browse the repository at this point in the history
they have been removed, cleanup no longer necessary
  • Loading branch information
spiffxp committed Mar 16, 2021
1 parent 856c002 commit 623bb00
Showing 1 changed file with 2 additions and 18 deletions.
20 changes: 2 additions & 18 deletions infra/gcp/ensure-organization.sh
Original file line number Diff line number Diff line change
Expand Up @@ -43,19 +43,7 @@ org_roles=(
iam.serviceAccountLister
)

old_org_roles=(
StorageBucketLister
)

# TODO(https://github.com/kubernetes/k8s.io/issues/1659): obviated by organization.admin, remove when bindings gone
old_org_admin_roles=(
roles/billing.user
roles/iam.organizationRoleAdmin
roles/resourcemanager.organizationAdmin
roles/resourcemanager.projectCreator
roles/resourcemanager.projectDeleter
roles/servicemanagement.quotaAdmin
)
old_org_roles=()

color 6 "Ensuring organization custom roles exist"
(
Expand Down Expand Up @@ -90,11 +78,7 @@ color 6 "Ensuring organization IAM bindings exist"

color 6 "Ensuring removed organization IAM bindings do not exist"
(
# TODO(spiffxp): remove this once the old bindings are confirmed gone
for role in "${old_org_admin_roles[@]}"; do
ensure_removed_org_role_binding "user:[email protected]" "${role}"
ensure_removed_org_role_binding "user:[email protected]" "${role}"
done
color 6 "No bindings to remove"
) 2>&1 | indent

color 6 "Ensuring removed organization custom roles do not exist"
Expand Down

0 comments on commit 623bb00

Please sign in to comment.