Skip to content

infra/gcp: clean stale removal code, misc prow cleanup#2076

Merged
k8s-ci-robot merged 4 commits intokubernetes:mainfrom
spiffxp:followup-cleanup
May 24, 2021
Merged

infra/gcp: clean stale removal code, misc prow cleanup#2076
k8s-ci-robot merged 4 commits intokubernetes:mainfrom
spiffxp:followup-cleanup

Conversation

@spiffxp
Copy link
Copy Markdown
Contributor

@spiffxp spiffxp commented May 21, 2021

Now that things have been removed, remove the stale data/code

Consolidate everything to use empower_gke_for_service_account instead of empower_ksa_to_svcacct

Add a PROW_JOB_NAMESPACE constant to lib.sh and replace hardcodes of test-pods

I think we're close to removing the remaining k8s-prow and k8s-prow-builds bindings but I need to move on to other stuff, will save that for a later PR

spiffxp added 4 commits May 21, 2021 12:27
Now that we've run the scripts, we no longer need the presence of
one-shot functions, or bindings that have already been removed.

Removed specifically:

- ensure_removed_google_prow_bindings (release, staging)
- removed_org_role bindings (organization)
- k8s-infra-gcp-auditor running on aaa (main)
use empower_gke_for_serviceaccount instead
@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label May 21, 2021
@k8s-ci-robot
Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: spiffxp

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot requested review from dims and thockin May 21, 2021 17:20
@k8s-ci-robot k8s-ci-robot added wg/k8s-infra approved Indicates a PR has been approved by an approver from all required OWNERS files. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels May 21, 2021
@ameukam
Copy link
Copy Markdown
Member

ameukam commented May 21, 2021

/lgtm
/hold
Remove hold when ready to deploy.

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 21, 2021
@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 21, 2021
@spiffxp
Copy link
Copy Markdown
Contributor Author

spiffxp commented May 24, 2021

/hold cancel

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 24, 2021
@k8s-ci-robot k8s-ci-robot merged commit 916f62d into kubernetes:main May 24, 2021
@k8s-ci-robot k8s-ci-robot added this to the v1.22 milestone May 24, 2021
@spiffxp spiffxp deleted the followup-cleanup branch May 24, 2021 16:52
@spiffxp
Copy link
Copy Markdown
Contributor Author

spiffxp commented May 24, 2021

To run:

  • infra/gcp/ensure-gsuite.sh
  • infra/gcp/ensure-main-project.sh
  • infra/gcp/ensure-organization.sh
  • infra/gcp/ensure-prod-storage.sh
  • infra/gcp/ensure-release-projects.sh
  • infra/gcp/ensure-staging-storage.sh

@spiffxp
Copy link
Copy Markdown
Contributor Author

spiffxp commented May 24, 2021

Ran everything I needed to run to confirm that changes were a no-op.

@ameukam
Copy link
Copy Markdown
Member

ameukam commented Jun 4, 2021

Related to : #516

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants