Skip to content

Conversation

@andrewd-zededa
Copy link
Contributor

@andrewd-zededa andrewd-zededa commented Jan 2, 2026

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

  • fresh usb install of EVE-OS HV=k "eve-k" which installs k3s 1.34.0 or higher (visible via kubectl get node)
  • Create a cluster of nodes
  • verify all nodes join the cluster via kubectl get node.

Changelog notes

None

PR Backports

  • 16.0: I don't think its needed.
  • 14.5-stable: No, as the feature is not available there.
  • 13.4-stable: No, as the feature is not available there.

Checklist

  • I've provided a proper description
  • I've added the proper documentation
  • I've tested my PR on amd64 device
  • I've tested my PR on arm64 device
  • I've written the test verification instructions
  • I've set the proper labels to this PR

And the last but not least:

  • I've checked the boxes above, or I've provided a good reason why I didn't
    check them.

Please, check the boxes above after submitting the PR in interactive mode.

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>
@andrewd-zededa andrewd-zededa force-pushed the eve-k-deprecated-master-node-label branch from bbd2cfd to 732abe2 Compare January 2, 2026 20:48
@codecov
Copy link

codecov bot commented Jan 2, 2026

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 26.49%. Comparing base (2281599) to head (732abe2).
⚠️ Report is 176 commits behind head on master.

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.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

Copy link
Contributor

@naiming-zededa naiming-zededa left a comment

Choose a reason for hiding this comment

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

LGTM

@zedi-pramodh
Copy link

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 ?

@naiming-zededa
Copy link
Contributor

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

@andrewd-zededa
Copy link
Contributor Author

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 fix is implemented to be overly cautious and continue coverage of the old label master or the new label control-plane. The new label control-plane has been added by k3s since k3s repo commit 63f2211b314d5e2e8c7b7cef027ffe369b5955f5 from December of 2020.

@andrewd-zededa andrewd-zededa marked this pull request as ready for review January 5, 2026 14:55
Copy link

@zedi-pramodh zedi-pramodh left a comment

Choose a reason for hiding this comment

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

LGTM

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants