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

Restore correct auth source precedence for kubelet bootstrapping #2547

Merged
merged 1 commit into from
Dec 22, 2022

Conversation

twz123
Copy link
Member

@twz123 twz123 commented Dec 21, 2022

Description

When introducing the k0s based kubelet kubeconfig bootstrapping, k0s defaulted to honor the join token argument over already existing kubeconfig files. This gives problems in conjunction with k0s install, as it bakes the join token arguments into the k0s service definition. So each time k0s gets started as a service, the join token argument will be present and tried to be used, even if the bootstrapping took place already.

Fix that by restoring the old precedence:

  1. Use an existing kubelet kubeconfig file if present.
  2. Use an existing kubelet bootstrap kubeconfig file if present.
  3. Use a join token, if present.
  4. Bail out with an error.

Fixes #2374.

Type of change

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Documentation update

How Has This Been Tested?

  • Manual test
  • Auto test added

Checklist:

  • My code follows the style guidelines of this project
  • My commit messages are signed-off
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • My changes generate no new warnings
  • I have added tests that prove my fix is effective or that my feature works
  • New and existing unit tests pass locally with my changes
  • Any dependent changes have been merged and published in downstream modules
  • I have checked my code and corrected any misspellings

When introducing the k0s based kubelet kubeconfig bootstrapping, k0s
defaulted to honor the join token argument over already existing
kubeconfig files. This gives problems in conjunction with `k0s install`,
as it bakes the join token arguments into the k0s service definition. So
each time k0s gets started as a service, the join token argument will be
present and tried to be used, even if the bootstrapping took place
already.

Fix that by restoring the old precedence:

1. Use an existing kubelet kubeconfig file if present.
2. Use an existing kubelet bootstrap kubeconfig file if present.
3. Use a join token, if present.
4. Bail out with an error.

Fixes: 84ea040 ("Let k0s exchange the kubelet bootstrap kubeconfig")
Signed-off-by: Tom Wieczorek <[email protected]>
@twz123 twz123 added the bug Something isn't working label Dec 21, 2022
@twz123 twz123 marked this pull request as ready for review December 21, 2022 15:37
@twz123 twz123 requested a review from a team as a code owner December 21, 2022 15:37
@twz123 twz123 merged commit bb33d05 into k0sproject:main Dec 22, 2022
@twz123 twz123 deleted the ignore-join-token-when-bootstrapped branch January 12, 2023 10:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants