mirror of
https://github.com/k3s-io/kubernetes.git
synced 2026-07-17 02:06:23 +00:00
Merge pull request #137996 from pacoxu/inplace-disable
set InPlacePodLevelResourcesVerticalScaling to false if needed
This commit is contained in:
@@ -4033,6 +4033,10 @@ func configureCPUManagerInKubelet(oldCfg *kubeletconfig.KubeletConfiguration, ku
|
||||
newCfg.FeatureGates["CPUManagerPolicyAlphaOptions"] = kubeletArguments.enableCPUManagerOptions
|
||||
newCfg.FeatureGates["DisableCPUQuotaWithExclusiveCPUs"] = kubeletArguments.disableCPUQuotaWithExclusiveCPUs
|
||||
newCfg.FeatureGates["PodLevelResources"] = kubeletArguments.enablePodLevelResources
|
||||
// InPlacePodLevelResourcesVerticalScaling is only supported when PodLevelResources is enabled
|
||||
if !kubeletArguments.enablePodLevelResources {
|
||||
newCfg.FeatureGates["InPlacePodLevelResourcesVerticalScaling"] = kubeletArguments.enablePodLevelResources
|
||||
}
|
||||
newCfg.FeatureGates["PodLevelResourceManagers"] = kubeletArguments.enablePodLevelResourceManagers
|
||||
|
||||
if kubeletArguments.customCPUCFSQuotaPeriod != 0 {
|
||||
|
||||
@@ -807,6 +807,10 @@ func configureMemoryManagerInKubelet(oldCfg *kubeletconfig.KubeletConfiguration,
|
||||
}
|
||||
|
||||
newCfg.FeatureGates["PodLevelResources"] = kubeletArguments.enablePodLevelResources
|
||||
// InPlacePodLevelResourcesVerticalScaling is only supported when PodLevelResources is enabled
|
||||
if !kubeletArguments.enablePodLevelResources {
|
||||
newCfg.FeatureGates["InPlacePodLevelResourcesVerticalScaling"] = kubeletArguments.enablePodLevelResources
|
||||
}
|
||||
newCfg.FeatureGates["PodLevelResourceManagers"] = kubeletArguments.enablePodLevelResourceManagers
|
||||
|
||||
newCfg.MemoryManagerPolicy = kubeletArguments.policyName
|
||||
|
||||
Reference in New Issue
Block a user