AutoSized Nodes now reference both masters and workers (#2997)

Azure · Jun 30, 2023 · 5f9df8a · 5f9df8a
1 parent e34c6d6
commit 5f9df8a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/pkg/operator/controllers/autosizednodes/autosizednodes_controller.go b/pkg/operator/controllers/autosizednodes/autosizednodes_controller.go
@@ -126,8 +126,11 @@ func makeConfig() mcv1.KubeletConfig {
 		Spec: mcv1.KubeletConfigSpec{
 			AutoSizingReserved: util.BoolToPtr(true),
 			MachineConfigPoolSelector: &metav1.LabelSelector{
-				MatchLabels: map[string]string{
-					"pools.operator.machineconfiguration.openshift.io/worker": "",
+				MatchExpressions: []metav1.LabelSelectorRequirement{
+					{
+						Key:      "machineconfiguration.openshift.io/mco-built-in",
+						Operator: metav1.LabelSelectorOpExists,
+					},
 				},
 			},
 		},

diff --git a/pkg/operator/controllers/autosizednodes/autosizednodes_controller_test.go b/pkg/operator/controllers/autosizednodes/autosizednodes_controller_test.go
@@ -84,8 +84,11 @@ func TestAutosizednodesReconciler(t *testing.T) {
 					Spec: mcv1.KubeletConfigSpec{
 						AutoSizingReserved: util.BoolToPtr(false),
 						MachineConfigPoolSelector: &metav1.LabelSelector{
-							MatchLabels: map[string]string{
-								"pools.operator.machineconfiguration.openshift.io/worker": "",
+							MatchExpressions: []metav1.LabelSelectorRequirement{
+								{
+									Key:      "machineconfiguration.openshift.io/mco-built-in",
+									Operator: metav1.LabelSelectorOpExists,
+								},
 							},
 						},
 					},