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.

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

infra/gcp/prow: actually remove extraneous ssh-keys #1894

Merged
merged 1 commit into from
Apr 9, 2021

Conversation

spiffxp
Copy link
Member

@spiffxp spiffxp commented Apr 9, 2021

I have added a [wip] commit to allow me to run ./infra/gcp/prow/ensure-e2e-projects.sh with a manual edit that skips everything per-project except ssh-key editing. Once that's done, I'll drop the [wip] commit from this PR.

The code as previously written didn't actually drop ssh-keys. It does now, by using a different comparison when K8S_INFRA_ENSURE_E2E_PROJECTS_RESETS_SSH_KEYS is true. To make it more obvious what's happening when editing ssh keys in project metadata, simulate a diff of before/after changes.

@k8s-ci-robot k8s-ci-robot added area/prow Setting up or working with prow in general, prow.k8s.io, prow build clusters sig/testing Categorizes an issue or PR as relevant to SIG Testing. wg/k8s-infra 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. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Apr 9, 2021
@spiffxp spiffxp force-pushed the reset-e2e-project-ssh-keys branch 2 times, most recently from 0a0fef4 to 5d792b7 Compare April 9, 2021 01:48
oh right, resetting ssh-keys means a different comparison needs to be used
@spiffxp spiffxp force-pushed the reset-e2e-project-ssh-keys branch from 5d792b7 to 37e374a Compare April 9, 2021 02:02
@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Apr 9, 2021
@spiffxp spiffxp changed the title infra/gcp/prow: display diffs caused by editing ssh-keys infra/gcp/prow: actually remove extraneous ssh-keys Apr 9, 2021
@spiffxp
Copy link
Member Author

spiffxp commented Apr 9, 2021

Running K8S_INFRA_ENSURE_E2E_PROJECTS_RESETS_SSH_KEYS=true ./infra/gcp/prow/ensure-e2e-projects.sh

Twice, just to be sure the change takes.

@spiffxp spiffxp force-pushed the reset-e2e-project-ssh-keys branch from 37e374a to 9fb7975 Compare April 9, 2021 05:11
@spiffxp
Copy link
Member Author

spiffxp commented Apr 9, 2021

Removed 37e374a

@k8s-ci-robot k8s-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Apr 9, 2021
@spiffxp
Copy link
Member Author

spiffxp commented Apr 9, 2021

/hold
Will wait to merge this until I've seen the results from the next audit PR

@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 Apr 9, 2021
@spiffxp
Copy link
Member Author

spiffxp commented Apr 9, 2021

/hold cancel
#1897 shows ssh-keys getting reset

@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 Apr 9, 2021
Copy link
Contributor

@hasheddan hasheddan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 9, 2021
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: hasheddan, spiffxp

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

The pull request process is described here

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

@ameukam
Copy link
Member

ameukam commented Apr 9, 2021

/lgtm

@k8s-ci-robot k8s-ci-robot merged commit ae7565b into kubernetes:main Apr 9, 2021
@k8s-ci-robot k8s-ci-robot added this to the v1.22 milestone Apr 9, 2021
@spiffxp spiffxp deleted the reset-e2e-project-ssh-keys branch April 9, 2021 16:58
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. area/prow Setting up or working with prow in general, prow.k8s.io, prow build clusters 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. sig/testing Categorizes an issue or PR as relevant to SIG Testing. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants