-
Notifications
You must be signed in to change notification settings - Fork 177
Fix cluster join: k3s 1.34.0+k3s1 does not set master label. #5521
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
base: master
Are you sure you want to change the base?
Fix cluster join: k3s 1.34.0+k3s1 does not set master label. #5521
Conversation
Master label has been deprecated since 1.20 k3s stopped setting it in 1.34.0-rc1+k3s1 PR 12395 Signed-off-by: Andrew Durbin <andrewd@zededa.com>
bbd2cfd to
732abe2
Compare
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## master #5521 +/- ##
==========================================
+ Coverage 19.52% 26.49% +6.96%
==========================================
Files 19 19
Lines 3021 2314 -707
==========================================
+ Hits 590 613 +23
+ Misses 2310 1559 -751
- Partials 121 142 +21 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
naiming-zededa
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
|
Does it break the upgrades from previous eve versions ? That is eve 16.0.0-lts will be running k3s 1.32 and in future if customer upgrades the eve version which contains 1.34 will there be any regression ? |
the patch has the 'OR' operation, it should handle both current and prior versions |
The fix is implemented to be overly cautious and continue coverage of the old label |
zedi-pramodh
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
Description
New EVE-OS installs with k3s v1.34.2+k3s1 will not have nodes setting the node label
node-role.kubernetes.io/master. Pillar/zedkube checks this before advertising cluster status via the /status web server endpoint.Master label has been deprecated since 1.20
k3s stopped setting it in 1.34.0-rc1+k3s1 PR 12395
Fixes regression from: #5483
PR dependencies
None
How to test and validate this PR
Changelog notes
None
PR Backports
Checklist
And the last but not least:
check them.
Please, check the boxes above after submitting the PR in interactive mode.