-
Notifications
You must be signed in to change notification settings - Fork 828
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
infra/gcp: remove cleanup of removed bindings/roles
they have been removed, cleanup no longer necessary
- Loading branch information
Showing
1 changed file
with
2 additions
and
18 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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" | ||
( | ||
|
@@ -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" | ||
|