fix: deprecate kubelet_flags in favour of kubelet_cmd_flags #7779
+323
−381
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
awesomenix
requested review from
AbelHu,
Devinwong,
cameronmeissner,
djsly,
ganeshkumarashok,
junjiezhang1997,
lilypan26,
mxj220,
pdamianov-dev,
phealy,
r2k1,
timmy-wright and
zachary-bailey
as code owners
awesomenix
force-pushed
the
nishp/use/kubecmdflags
branch
from
d1fd6a5 to
513ff2d
Compare
Contributor
|
The latest Buf updates on your PR. Results from workflow Buf CI / buf (pull_request).
|
awesomenix
changed the title
Contributor
There was a problem hiding this comment.
Pull request overview
This pull request simplifies kubelet configuration by transitioning from map-based flag manipulation to direct string-based flags. The PR deprecates the old kubelet_flags and kubelet_node_labels map fields in favor of new kubelet_cmd_flags and kubelet_cmd_node_labels string fields. This allows external components to provide pre-formatted flag strings without requiring the system to parse and manipulate them.
Changes:
- Deprecated
kubelet_flagsandkubelet_node_labelsmap fields in protobuf schema - Added new
kubelet_cmd_flagsandkubelet_cmd_node_labelsstring fields - Updated e2e tests to use string concatenation instead of map manipulation
- Removed
baseKubeletConfigfunction and simplified node config initialization - Added backward compatibility fallback logic in parser
Reviewed changes
Copilot reviewed 8 out of 8 changed files in this pull request and generated 5 comments.
Show a summary per file
| File | Description |
|---|---|
| aks-node-controller/proto/aksnodeconfig/v1/kubelet_config.proto | Deprecated old map fields, added new string fields with inaccurate comment |
| aks-node-controller/pkg/gen/aksnodeconfig/v1/kubelet_config.pb.go | Auto-generated protobuf code reflecting schema changes |
| e2e/scenario_test.go | Updated tests to use string concatenation (with critical delimiter bugs) |
| e2e/node_config.go | Removed baseKubeletConfig, simplified initialization using external component |
| aks-node-controller/parser/parser.go | Updated to use new helper function for node labels |
| aks-node-controller/parser/helper.go | Added getKubeletNodeLabels with backward compatibility |
| aks-node-controller/parser/parser_test.go | Updated test to use new string field |
| aks-node-controller/helpers/utils_test.go | Updated test expectations from map to string format |
aks-node-controller/proto/aksnodeconfig/v1/kubelet_config.proto
Outdated
Show resolved
Hide resolved
awesomenix
force-pushed
the
nishp/use/kubecmdflags
branch
from
413604c to
36970b0
Compare
awesomenix
force-pushed
the
nishp/use/kubecmdflags
branch
from
36970b0 to
ebd6f82
Compare
Devinwong
approved these changes
Feb 4, 2026
| // When kubelet_cmd_node_labels is present, it takes precedence and is returned as-is (raw string). | ||
| // Otherwise, it falls back to constructing flags from the kubelet_node_labels map (sorted key-value pairs). | ||
| func getKubeletNodeLabels(kubeletConfig *aksnodeconfigv1.KubeletConfig) string { | ||
| if kubeletConfig.GetKubeletCmdNodeLabels() != "" { |
Contributor
There was a problem hiding this comment.
so the bootstrapper now specifies node labels within a dedicated proto field? - is this PR mainly to separate out node labels from kubelet flags?
Contributor
Author
|
this is going backwards to client providing everything like before, instead of relying to structured input. I am abandoning this |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What this PR does / why we need it:
We do some surgery in case when we pass in node flags, stop doing that and just return string from external component
deprecate old fields
Which issue(s) this PR fixes:
Fixes #