UPSTREAM: <carry>: set correctly static pods CPUs when workload parti…

…tioning is disabled Signed-off-by: Artyom Lukianov <alukiano@redhat.com>
openshift · Jan 23, 2022 · aa87520 · aa87520
1 parent 06791f6
commit aa87520
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/pkg/kubelet/cm/cpumanager/cpu_manager.go b/pkg/kubelet/cm/cpumanager/cpu_manager.go
@@ -396,14 +396,15 @@ func (m *manager) reconcileState() (success []reconciledContainer, failure []rec
 	failure = []reconciledContainer{}
 
 	m.removeStaleState()
+	workloadEnabled := managed.IsEnabled()
 	for _, pod := range m.activePods() {
 		pstatus, ok := m.podStatusProvider.GetPodStatus(pod.UID)
 		if !ok {
 			klog.V(4).InfoS("ReconcileState: skipping pod; status not found", "pod", klog.KObj(pod))
 			failure = append(failure, reconciledContainer{pod.Name, "", ""})
 			continue
 		}
-		if enabled, _, _ := managed.IsPodManaged(pod); enabled {
+		if enabled, _, _ := managed.IsPodManaged(pod); workloadEnabled && enabled {
 			klog.V(4).InfoS("[cpumanager] reconcileState: skipping pod; pod is managed (pod: %s)", pod.Name)
 			continue
 		}

diff --git a/pkg/kubelet/managed/managed.go b/pkg/kubelet/managed/managed.go
@@ -62,8 +62,8 @@ func IsEnabled() bool {
 	return pinnedManagementEnabled
 }
 
-/// IsPodManaged returns true and the name of the workload if enabled.
-/// returns true, workload name, and the annotation payload.
+// IsPodManaged returns true and the name of the workload if enabled.
+// returns true, workload name, and the annotation payload.
 func IsPodManaged(pod *v1.Pod) (bool, string, string) {
 	if pod.ObjectMeta.Annotations == nil {
 		return false, "", ""