Merge pull request kubernetes#82104 from klueska/upstream-fix-cpu-manager-topology-bug

Fix bug in CPUManager with setting topology for policies

Author: k8s-ci-robot

pkg/kubelet/cm/cpumanager/cpu_manager.go

@@ -113,7 +113,7 @@ func NewManager(cpuPolicyName string, reconcilePeriod time.Duration, machineInfo
 
 	case PolicyStatic:
 		var err error
-		topo, err := topology.Discover(machineInfo, numaNodeInfo)
+		topo, err = topology.Discover(machineInfo, numaNodeInfo)
 		if err != nil {
 			return nil, err
 		}

pkg/kubelet/cm/cpumanager/cpu_manager_test.go

@@ -353,6 +353,16 @@ func TestCPUManagerGenerate(t *testing.T) {
 				if rawMgr.policy.Name() != testCase.expectedPolicy {
 					t.Errorf("Unexpected policy name. Have: %q wants %q", rawMgr.policy.Name(), testCase.expectedPolicy)
 				}
+				if rawMgr.policy.Name() == string(PolicyNone) {
+					if rawMgr.topology != nil {
+						t.Errorf("Expected topology to be nil for 'none' policy. Have: %q", rawMgr.topology)
+					}
+				}
+				if rawMgr.policy.Name() != string(PolicyNone) {
+					if rawMgr.topology == nil {
+						t.Errorf("Expected topology to be non-nil for policy '%v'. Have: %q", rawMgr.policy.Name(), rawMgr.topology)
+					}
+				}
 			}
 		})