Merge pull request #5332 from djoshy/add-cpms-support

MCO-1807: Add CPMS support in the MCO's boot image controller

Author: openshift-merge-bot[bot]

cmd/machine-config-controller/start.go

@@ -134,6 +134,7 @@ func runStartCmd(_ *cobra.Command, _ []string) {
 				ctrlctx.ClientBuilder.MachineClientOrDie("machine-set-boot-image-controller"),
 				ctrlctx.KubeNamespacedInformerFactory.Core().V1().ConfigMaps(),
 				ctrlctx.MachineInformerFactory.Machine().V1beta1().MachineSets(),
+				ctrlctx.MachineInformerFactory.Machine().V1().ControlPlaneMachineSets(),
 				ctrlctx.ConfigInformerFactory.Config().V1().Infrastructures(),
 				ctrlctx.ClientBuilder.OperatorClientOrDie(componentName),
 				ctrlctx.OperatorInformerFactory.Operator().V1().MachineConfigurations(),

go.mod

@@ -35,7 +35,7 @@ require (
 	github.com/onsi/gomega v1.36.2
 	github.com/opencontainers/go-digest v1.0.0
 	github.com/openshift-eng/openshift-tests-extension v0.0.0-20250722101414-8083129ab8f9
-	github.com/openshift/api v0.0.0-20250911131931-2acafd4d1ed2
+	github.com/openshift/api v0.0.0-20251013165757-fe48e8fd548b
 	github.com/openshift/client-go v0.0.0-20250911202206-1bc0cb0da03b
 	github.com/openshift/library-go v0.0.0-20250911074910-e2c18d5abc3a
 	github.com/openshift/runtime-utils v0.0.0-20230921210328-7bdb5b9c177b

go.sum

@@ -595,8 +595,8 @@ github.com/opencontainers/selinux v1.12.0 h1:6n5JV4Cf+4y0KNXW48TLj5DwfXpvWlxXplU
 github.com/opencontainers/selinux v1.12.0/go.mod h1:BTPX+bjVbWGXw7ZZWUbdENt8w0htPSrlgOOysQaU62U=
 github.com/openshift-eng/openshift-tests-extension v0.0.0-20250722101414-8083129ab8f9 h1:4ZeSM80DVCb5WWB3Q/fyCI9jYXAl9bfrGnFvFONqzN4=
 github.com/openshift-eng/openshift-tests-extension v0.0.0-20250722101414-8083129ab8f9/go.mod h1:6gkP5f2HL0meusT0Aim8icAspcD1cG055xxBZ9yC68M=
-github.com/openshift/api v0.0.0-20250911131931-2acafd4d1ed2 h1:orbYgUTUMs2asHZhT792jeXlVzOqGFaGo8FbD9ihnsE=
-github.com/openshift/api v0.0.0-20250911131931-2acafd4d1ed2/go.mod h1:SPLf21TYPipzCO67BURkCfK6dcIIxx0oNRVWaOyRcXM=
+github.com/openshift/api v0.0.0-20251013165757-fe48e8fd548b h1:X18aj8dcvmGC9T7xiHHz3B9YRT4b5KiX/snG27cj9mc=
+github.com/openshift/api v0.0.0-20251013165757-fe48e8fd548b/go.mod h1:SPLf21TYPipzCO67BURkCfK6dcIIxx0oNRVWaOyRcXM=
 github.com/openshift/client-go v0.0.0-20250911202206-1bc0cb0da03b h1:VQpSjWE8jmsPj+EXB+XABTLmDgg9xtT8/fudB/31/aI=
 github.com/openshift/client-go v0.0.0-20250911202206-1bc0cb0da03b/go.mod h1:w7sV33ASK/HcuEb0Ll9qvChZdJwNwqo8GocVAnd7fVY=
 github.com/openshift/kubernetes v1.30.1-0.20250716113245-b94367cabf3e h1:M5BrUTglTltZjcRz5ouJBqSw0a60p760Bl520ndOGS0=

manifests/machineconfigcontroller/clusterrole.yaml

@@ -37,7 +37,7 @@ rules:
   resources: ["daemonsets"]
   verbs: ["get"]
 - apiGroups: ["machine.openshift.io"]
-  resources: ["machinesets","machines"]
+  resources: ["machinesets","machines","controlplanemachinesets"]
   verbs: ["get", "list", "watch", "patch"]
 - apiGroups: ["operator.openshift.io"]
   resources: ["machineconfigurations/status"]

pkg/controller/machine-set-boot-image/cpms_helpers.go

@@ -24,6 +24,7 @@ import (
 )
 
 // syncMAPIMachineSets will attempt to enqueue every machineset
+// nolint:dupl // I separated this from syncControlPlaneMachineSets for readability
 func (ctrl *Controller) syncMAPIMachineSets(reason string) {
 
 	ctrl.mapiSyncMutex.Lock()

pkg/controller/machine-set-boot-image/machine_set_boot_image_controller.go

@@ -62,6 +62,7 @@ func checkMachineSet(infra *osconfigv1.Infrastructure, machineSet *machinev1beta
 }
 
 // Generic reconcile function that handles the common pattern across all platforms
+// nolint:dupl // I separated this from reconcilePlatformCPMS for readability
 func reconcilePlatform[T any](
 	machineSet *machinev1beta1.MachineSet,
 	infra *osconfigv1.Infrastructure,