From 910cf31ccd310b9ae06853021863c9179208aa2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Luis=20Ojosnegros=20Manch=C3=B3n?= Date: Wed, 7 Feb 2024 13:32:06 +0100 Subject: [PATCH] Render: Add MCSelector to missing default MCPs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jose Luis Ojosnegros Manchón --- pkg/util/manifests.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkg/util/manifests.go b/pkg/util/manifests.go index c1b13d67c8..3687c73355 100644 --- a/pkg/util/manifests.go +++ b/pkg/util/manifests.go @@ -115,6 +115,7 @@ func AppendMissingDefaultMCPManifests(currentMCPs []*mcfgv1.MachineConfigPool) [ workerLabels = labelPrefix + worker masterNodeSelector = components.NodeRoleLabelPrefix + master workerNodeSelector = components.NodeRoleLabelPrefix + worker + mcSelectorLabel = "machineconfiguration.openshift.io/role" ) var ( finalMCPList = []*mcfgv1.MachineConfigPool{} @@ -127,7 +128,8 @@ func AppendMissingDefaultMCPManifests(currentMCPs []*mcfgv1.MachineConfigPool) [ Name: master, }, Spec: mcfgv1.MachineConfigPoolSpec{ - NodeSelector: v1.AddLabelToSelector(&v1.LabelSelector{}, masterNodeSelector, ""), + NodeSelector: v1.AddLabelToSelector(&v1.LabelSelector{}, masterNodeSelector, ""), + MachineConfigSelector: v1.AddLabelToSelector(&v1.LabelSelector{}, mcSelectorLabel, master), }, }, { @@ -138,7 +140,8 @@ func AppendMissingDefaultMCPManifests(currentMCPs []*mcfgv1.MachineConfigPool) [ Name: worker, }, Spec: mcfgv1.MachineConfigPoolSpec{ - NodeSelector: v1.AddLabelToSelector(&v1.LabelSelector{}, workerNodeSelector, ""), + NodeSelector: v1.AddLabelToSelector(&v1.LabelSelector{}, workerNodeSelector, ""), + MachineConfigSelector: v1.AddLabelToSelector(&v1.LabelSelector{}, mcSelectorLabel, worker), }, }, }