Skip to content

Commit f21473b

Browse files
committed
Set pod-level CPUPeriod only if CPUQuota is changed
Signed-off-by: Itamar Holder <[email protected]>
1 parent c792c30 commit f21473b

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

pkg/kubelet/kuberuntime/kuberuntime_manager.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -663,13 +663,14 @@ func (m *kubeGenericRuntimeManager) doPodResizeAction(pod *v1.Pod, podStatus *ku
663663
var err error
664664
switch rName {
665665
case v1.ResourceCPU:
666-
podCpuResources := &cm.ResourceConfig{CPUPeriod: podResources.CPUPeriod}
666+
podCPUResources := &cm.ResourceConfig{}
667667
if setLimitValue {
668-
podCpuResources.CPUQuota = podResources.CPUQuota
668+
podCPUResources.CPUPeriod = podResources.CPUPeriod
669+
podCPUResources.CPUQuota = podResources.CPUQuota
669670
} else {
670-
podCpuResources.CPUShares = podResources.CPUShares
671+
podCPUResources.CPUShares = podResources.CPUShares
671672
}
672-
err = pcm.SetPodCgroupConfig(pod, podCpuResources)
673+
err = pcm.SetPodCgroupConfig(pod, podCPUResources)
673674
case v1.ResourceMemory:
674675
err = pcm.SetPodCgroupConfig(pod, podResources)
675676
}

0 commit comments

Comments
 (0)