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: use two default ssh keys #1904

Merged

Conversation

spiffxp
Copy link
Member

@spiffxp spiffxp commented Apr 9, 2021

This is followup to #1894

Fixes #1751

I would rather just use the one, but I no longer have time to untangle whatever is going on between prow, kubetest2, cluster/log-dump.sh and gcloud ssh (ref: #1751 (comment))

Since the steady state we've converged on is most projects having both keys, make that the default / expected state

As with #1894 I've added a [wip] commit to this PR to make running this script faster. Will remove commit and [wip] from PR once actuated.

I would rather just use the one, but I no longer have time to untangle
whatever is going on between prow, kubetest2, cluster/log-dump.sh and
`gcloud ssh`

Since the steady state we've converged on is most projects having both
keys, make that the default / expected state
@k8s-ci-robot k8s-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. area/prow Setting up or working with prow in general, prow.k8s.io, prow build clusters labels Apr 9, 2021
@k8s-ci-robot k8s-ci-robot requested review from chaodaiG and puerco April 9, 2021 19:33
@k8s-ci-robot k8s-ci-robot added 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. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Apr 9, 2021
@spiffxp spiffxp force-pushed the default-multiple-e2e-ssh-keys branch from 712053a to 8da8aa9 Compare April 9, 2021 19:39
@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 spiffxp changed the title [wip] infra/gcp/prow: use two default ssh keys infra/gcp/prow: use two default ssh keys Apr 9, 2021
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Apr 9, 2021
@spiffxp
Copy link
Member Author

spiffxp commented Apr 9, 2021

OK, removed [wip] commit 712053a

Ran K8S_INFRA_ENSURE_E2E_PROJECTS_RESETS_SSH_KEYS=true ./ensure-e2e-projects.sh, added keys to:

  • k8s-infra-e2e-gce-project
  • k8s-infra-e2e-node-e2e-project
  • k8s-infra-e2e-boskos-scale-12

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

@k8s-ci-robot k8s-ci-robot merged commit e7386a9 into kubernetes:main Apr 9, 2021
@k8s-ci-robot k8s-ci-robot added this to the v1.22 milestone Apr 9, 2021
fi

if ! diff ${ssh_keys_before} ${ssh_keys_after} >/dev/null; then
gcloud compute project-info add-metadata --project="${prj}" \
cloud compute project-info add-metadata --project="${prj}" \
Copy link
Member

Choose a reason for hiding this comment

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

@spiffxp Nit?

Copy link
Member Author

Choose a reason for hiding this comment

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

good catch, thank you

Copy link
Member Author

Choose a reason for hiding this comment

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

#1907 should fix

@spiffxp spiffxp deleted the default-multiple-e2e-ssh-keys branch April 9, 2021 20:34
@cpanato
Copy link
Member

cpanato commented Apr 10, 2021

/lgtm late :)

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.

audit-followup: deal with project ssh-keys growing
5 participants