mirror of
https://github.com/optim-enterprises-bv/kubernetes.git
synced 2025-11-02 03:08:15 +00:00
Merge pull request #127577 from vaibhav2107/eviction-hard
Added the MergeDefaultEvictionSettings Kubelet Config
This commit is contained in:
@@ -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
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user