fix(pkg/agent): merge kubelet config content with flag defaults#8777
Draft
abigailliang-aks-sig-node wants to merge 5 commits into
Draft
fix(pkg/agent): merge kubelet config content with flag defaults#8777abigailliang-aks-sig-node wants to merge 5 commits into
abigailliang-aks-sig-node wants to merge 5 commits into
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
This PR updates how pkg/agent generates kubelet config-file JSON by merging sources: start from customKubeletConfig content and only backfill missing fields from flag-derived values, while keeping the existing kubelet CLI flag filtering behavior unchanged.
Changes:
- Refactors
GetKubeletConfigFileContentto build a content-derived config first, then merge in missing fields from the flag-derived config. - Introduces helper functions to merge config content and flags via a map-based merge.
- Adds a unit test to verify that content values are not overwritten while missing fields are filled from flags.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 2 comments.
| File | Description |
|---|---|
| pkg/agent/utils.go | Refactors kubelet config-file generation and adds helper-based merge logic; keeps CLI filtering semantics while preparing for a future “config-file authoritative” shift. |
| pkg/agent/utils_test.go | Adds a unit test validating that content wins on conflicts and flags backfill missing fields. |
Comment on lines
+651
to
+667
| func mergeKubeletConfigContentFromFlags(contentConfig, flagConfig *datamodel.AKSKubeletConfiguration) *datamodel.AKSKubeletConfiguration { | ||
| contentMap := kubeletConfigToMap(contentConfig) | ||
| flagMap := kubeletConfigToMap(flagConfig) | ||
| mergeMissingConfigFields(contentMap, flagMap) | ||
|
|
||
| mergedBytes, _ := json.Marshal(contentMap) | ||
| mergedConfig := &datamodel.AKSKubeletConfiguration{} | ||
| _ = json.Unmarshal(mergedBytes, mergedConfig) | ||
| return mergedConfig | ||
| } | ||
|
|
||
| func kubeletConfigToMap(config *datamodel.AKSKubeletConfiguration) map[string]interface{} { | ||
| configBytes, _ := json.Marshal(config) | ||
| configMap := map[string]interface{}{} | ||
| _ = json.Unmarshal(configBytes, &configMap) | ||
| return configMap | ||
| } |
Author
@microsoft-github-policy-service agree company="Microsoft" |
abigailliang-aks-sig-node
changed the title
abigailliang-aks-sig-node
force-pushed
the
migrate-kubelet-config-file
branch
from
833db25 to
95b1c88
Compare
Comment on lines
+640
to
641
| configStringByte, _ := json.MarshalIndent(mergedConfig, "", " ") | ||
| return string(configStringByte) |
Comment on lines
+644
to
+660
| func mergeKubeletConfigContentFromFlags(contentConfig, flagConfig *datamodel.AKSKubeletConfiguration) *datamodel.AKSKubeletConfiguration { | ||
| contentMap := kubeletConfigToMap(contentConfig) | ||
| flagMap := kubeletConfigToMap(flagConfig) | ||
| mergeMissingConfigFields(contentMap, flagMap) | ||
|
|
||
| mergedBytes, _ := json.Marshal(contentMap) | ||
| mergedConfig := &datamodel.AKSKubeletConfiguration{} | ||
| _ = json.Unmarshal(mergedBytes, mergedConfig) | ||
| return mergedConfig | ||
| } | ||
|
|
||
| func kubeletConfigToMap(config *datamodel.AKSKubeletConfiguration) map[string]interface{} { | ||
| configBytes, _ := json.Marshal(config) | ||
| configMap := map[string]interface{}{} | ||
| _ = json.Unmarshal(configBytes, &configMap) | ||
| return configMap | ||
| } |
Comment on lines
+694
to
+701
| if cfg.EventRecordQps == nil { | ||
| if val, ok := flags["--event-qps"]; ok && val != "" { | ||
| if n, err := strconv.ParseInt(val, 10, 32); err == nil { | ||
| v := int32(n) | ||
| cfg.EventRecordQps = &v | ||
| } | ||
| } | ||
| } |
Comment on lines
+632
to
+636
| contentConfig := &datamodel.AKSKubeletConfiguration{ | ||
| APIVersion: "kubelet.config.k8s.io/v1beta1", | ||
| Kind: "KubeletConfiguration", | ||
| FeatureGates: map[string]bool{}, | ||
| } |
Comment on lines
+649
to
+652
| mergedBytes, _ := json.Marshal(contentMap) | ||
| mergedConfig := &datamodel.AKSKubeletConfiguration{} | ||
| _ = json.Unmarshal(mergedBytes, mergedConfig) | ||
| return mergedConfig |
Comment on lines
666
to
+669
| // getKubeletConfigFileContent converts kubelet flags we set to a file, and return the json content. | ||
| // Fields already set in KubeletConfigFileConfig take precedence; missing optional fields are | ||
| // backfilled from KubeletFlags so that kubelet does not fall back to v1beta1 defaults when AKS | ||
| // intends a specific value (e.g. --event-qps=0 must appear in the config file as 0, not 5). |
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
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.
Summary
GetKubeletConfigFileContentBehavior
Validation
go test ./pkg/agent -count 1Test Plan
utils_test.go, verify 1.the conflict case keeps content value for imageGCHighThresholdPercent. 2.maxPods is backfilled from flags when content omits it. 3. eventRecordQps is backfilled from --event-qps only when EventRecordQps is nil.Confirm no impact to non-kubelet parser fields in [helper.go].