scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-02 03:08:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix test cases for cpu shares

Browse Source
This commit is contained in:
waynepeking348
2022-03-21 21:45:49 +08:00
committed by shaowei.wayne
parent 4c87589300
commit 0b6d27002f
2 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/kubelet/kuberuntime/kuberuntime_container_linux.go
View File

@@ -142,9 +142,9 @@ func (m *kubeGenericRuntimeManager) calculateLinuxResources(cpuRequest, cpuLimit
// If request is not specified, but limit is, we want request to default to limit.
// API server does this for new containers, but we repeat this logic in Kubelet
// for containers running on existing Kubernetes clusters.
if cpuRequest == nil && !cpuLimit.IsZero() {
if cpuRequest == nil {
cpuShares = int64(cm.MilliCPUToShares(cpuLimit.MilliValue()))
} else if cpuRequest != nil {
} else {
// if cpuRequest.Amount is nil, then MilliCPUToShares will return the minimal number
// of CPU shares.
cpuShares = int64(cm.MilliCPUToShares(cpuRequest.MilliValue()))