Merge pull request #127577 from vaibhav2107/eviction-hard

Added the MergeDefaultEvictionSettings Kubelet Config
This commit is contained in:
Kubernetes Prow Robot
2025-02-26 12:10:30 -08:00
committed by GitHub
12 changed files with 58 additions and 0 deletions

View File

@@ -443,6 +443,12 @@ func loadConfigFile(name string) (*kubeletconfiginternal.KubeletConfiguration, e
// See: https://github.com/kubernetes/kubernetes/pull/110263
if kc.EvictionHard == nil {
kc.EvictionHard = eviction.DefaultEvictionHard
} else if kc.MergeDefaultEvictionSettings {
for k, v := range eviction.DefaultEvictionHard {
if _, exists := kc.EvictionHard[k]; !exists {
kc.EvictionHard[k] = v
}
}
}
return kc, err
}