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

Improve flannel RBAC changes #11569

Merged
merged 1 commit into from
Jan 11, 2025

Conversation

brandond
Copy link
Member

@brandond brandond commented Jan 10, 2025

Proposed Changes

Only wait for k3s-controller RBAC when AuthorizeNodeWithSelectors blocks kubelet from listing nodes.

This allows agents to use whichever client allows flannel to list/watch nodes. If the feature-gate does not block access to nodes, then the kubelet kubeconfig will be used as in older releases. If it does block access, then we will wait for k3s-controller RBAC to be created and use that instead.

This is a forward-port of the compat changes being made to the <= v1.31 branches, where agents will need to support servers that may or may not have the updated k3s-controller RBAC.

Types of Changes

compat fix

Verification

see compat tests in CI

Testing

yes

Linked Issues

User-Facing Change

Further Comments

Only wait for k3s-controller RBAC when AuthorizeNodeWithSelectors blocks kubelet from listing nodes

Signed-off-by: Brad Davidson <[email protected]>
@brandond brandond requested a review from a team as a code owner January 10, 2025 22:56
Copy link

codecov bot commented Jan 11, 2025

Codecov Report

Attention: Patch coverage is 47.05882% with 18 lines in your changes missing coverage. Please review.

Project coverage is 47.80%. Comparing base (0144d9b) to head (49148c8).
Report is 2 commits behind head on master.

Files with missing lines Patch % Lines
pkg/util/api.go 40.00% 8 Missing and 4 partials ⚠️
pkg/agent/flannel/setup.go 57.14% 3 Missing and 3 partials ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##           master   #11569      +/-   ##
==========================================
- Coverage   50.04%   47.80%   -2.25%     
==========================================
  Files         185      185              
  Lines       19239    19265      +26     
==========================================
- Hits         9629     9209     -420     
- Misses       8222     8727     +505     
+ Partials     1388     1329      -59     
Flag Coverage Δ
e2etests 40.58% <47.05%> (-3.74%) ⬇️
inttests 35.08% <47.05%> (-0.13%) ⬇️
unittests 17.03% <0.00%> (-0.03%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@brandond brandond merged commit 6b0247f into k3s-io:master Jan 11, 2025
39 checks passed
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