Merge pull request #25310 from cynepco3hahue/cherry_pick_90419_releas…

…e_45 [release-4.5] Bug 1846451: UPSTREAM: 90419: update strategy used to reuse CPUs from init containers in CPUManager
openshift · Sep 26, 2020 · 970c1b3 · 970c1b3
2 parents 47c0e71 + 0f5abee
commit 970c1b3
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 19 deletions.
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/cm/cpumanager/cpu_manager_test.go b/vendor/k8s.io/kubernetes/pkg/kubelet/cm/cpumanager/cpu_manager_test.go
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/cm/cpumanager/policy_static.go b/vendor/k8s.io/kubernetes/pkg/kubelet/cm/cpumanager/policy_static.go
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/cm/cpumanager/policy_static_test.go b/vendor/k8s.io/kubernetes/pkg/kubelet/cm/cpumanager/policy_static_test.go