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

🐛 Fix to enable bootstrap secret rotation if the secret itself missing #7717

Merged

Conversation

bdehri
Copy link
Contributor

@bdehri bdehri commented Dec 9, 2022

What this PR does / why we need it:

When the bootstrap token is expired and the respective secret is already cleaned up, MachinePools cannot be scaled up due to missing token. In order to mitigate this issue, the secret can be rotated if it is missing.

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #6029

@k8s-ci-robot k8s-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Dec 9, 2022
@linux-foundation-easycla
Copy link

linux-foundation-easycla bot commented Dec 9, 2022

CLA Signed

The committers listed above are authorized under a signed CLA.

  • ✅ login: bdehri / name: Berk Dehrioglu (2788a24)

@k8s-ci-robot k8s-ci-robot added the cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. label Dec 9, 2022
@k8s-ci-robot
Copy link
Contributor

Welcome @bdehri!

It looks like this is your first PR to kubernetes-sigs/cluster-api 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes-sigs/cluster-api has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

@k8s-ci-robot
Copy link
Contributor

Hi @bdehri. Thanks for your PR.

I'm waiting for a kubernetes-sigs member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@k8s-ci-robot k8s-ci-robot added needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Dec 9, 2022
@AverageMarcus
Copy link
Member

/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Dec 9, 2022
@bdehri
Copy link
Contributor Author

bdehri commented Dec 12, 2022

/retest

@fabriziopandini
Copy link
Member

Before reviewing the PR I would like to better understand in which case the bootstrap token for a machine poll can expire, given that we are continuously refreshing it.
/cc @CecileRobertMichon

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. and removed cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. labels Dec 12, 2022
@CecileRobertMichon
Copy link
Contributor

Before reviewing the PR I would like to better understand in which case the bootstrap token for a machine poll can expire, given that we are continuously refreshing it.

I have the same question. Although the fix itself seems relatively harmless, in the worst case it's just dead code that is never reached.

/cc @mboersma

@bdehri
Copy link
Contributor Author

bdehri commented Dec 16, 2022

/test pull-cluster-api-test-main
/test pull-cluster-api-verify-main

@bdehri
Copy link
Contributor Author

bdehri commented Dec 16, 2022

Hello @CecileRobertMichon, @fabriziopandini,

At the moment, cause of the deletion is unknown to us and we could not reproduce the issue in a reliable manner. We found that it happens some time passed after initial deployment. Until we discover the root cause, we wanted to make the code more resilient against such issues.

@bdehri bdehri marked this pull request as ready for review December 16, 2022 10:55
@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 Dec 16, 2022
@CecileRobertMichon
Copy link
Contributor

@bdehri understood. In that case given

the fix itself seems relatively harmless, in the worst case it's just dead code that is never reached

I'm okay with this fix if we add a code comment to explain why we need it

@bdehri bdehri requested review from CecileRobertMichon and removed request for mboersma, stmcginnis and JoelSpeed December 23, 2022 08:29
@fabriziopandini
Copy link
Member

lgtm pending squash

@bdehri bdehri force-pushed the rotate-bootstrap-token-if-missing branch from 53657a6 to ad5b522 Compare January 2, 2023 08:04
@sbueringer
Copy link
Member

lgtm pending squash

@fabriziopandini Just a quick reminder (to everyone :)). We can now - if we want to - lgtm before the squash and the lgtm label will be preserved.

Copy link
Contributor

@CecileRobertMichon CecileRobertMichon left a comment

Choose a reason for hiding this comment

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

/lgtm
/approve

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

LGTM label has been added.

Git tree hash: 3ea0fd87ab9b2836ab010b3bbf2ee392adb774ca

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: CecileRobertMichon

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 added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 3, 2023
@k8s-ci-robot k8s-ci-robot merged commit ea426f7 into kubernetes-sigs:main Jan 3, 2023
@k8s-ci-robot k8s-ci-robot added this to the v1.4 milestone Jan 3, 2023
@sbueringer
Copy link
Member

Seems to fall under "bugs without easy workarounds"

/cherry-pick release-1.3

@sbueringer
Copy link
Member

/cherry-pick release-1.2

@k8s-infra-cherrypick-robot

@sbueringer: new pull request created: #7853

In response to this:

Seems to fall under "bugs without easy workarounds"

/cherry-pick release-1.3

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@k8s-infra-cherrypick-robot

@sbueringer: new pull request created: #7854

In response to this:

/cherry-pick release-1.2

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

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. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
7 participants