[release-4.18][manual] objstate: rte: isolate platform-specific code

controllers/numaresourcesoperator_controller.go

@@ -300,13 +300,13 @@ func (r *NUMAResourcesOperatorReconciler) reconcileResource(ctx context.Context,
 	existing := rtestate.FromClient(ctx, r.Client, r.Platform, r.RTEManifests, instance, trees, r.Namespace)
 
 	if r.Platform == platform.OpenShift {
-		if step := r.reconcileResourceMachineConfig(ctx, instance, &existing, trees); step.EarlyStop() {
+		if step := r.reconcileResourceMachineConfig(ctx, instance, existing, trees); step.EarlyStop() {
 			updateStatusConditionsIfNeeded(instance, step.ConditionInfo)
 			return step
 		}
 	}
 
-	dsPerPool, step := r.reconcileResourceDaemonSet(ctx, instance, &existing, trees)
+	dsPerPool, step := r.reconcileResourceDaemonSet(ctx, instance, existing, trees)
 	if step.EarlyStop() {
 		updateStatusConditionsIfNeeded(instance, step.ConditionInfo)
 		return step
@@ -548,16 +548,16 @@ func (r *NUMAResourcesOperatorReconciler) syncNUMAResourcesOperatorResources(ctx
 	}
 	rteupdate.SecurityContextConstraint(r.RTEManifests.Core.SecurityContextConstraint, annotations.IsCustomPolicyEnabled(instance.Annotations))
 
-	processor := func(poolName string, gdm *rtestate.GeneratedDesiredManifest) error {
+	existing = existing.WithManifestsUpdater(func(poolName string, gdm *rtestate.GeneratedDesiredManifest) error {
 		err := daemonsetUpdater(poolName, gdm)
 		if err != nil {
 			return err
 		}
 		dsPoolPairs = append(dsPoolPairs, poolDaemonSet{poolName, nropv1.NamespacedNameFromObject(gdm.DaemonSet)})
 		return nil
-	}
+	})
 
-	for _, objState := range existing.State(r.RTEManifests, processor, annotations.IsCustomPolicyEnabled(instance.Annotations)) {
+	for _, objState := range existing.State(r.RTEManifests) {
 		if objState.Error != nil {
 			// We are likely in the bootstrap scenario. In this case, which is expected once, everything is fine.
 			// If it happens past bootstrap, still carry on. We know what to do, and we do want to enforce the desired state.

pkg/objectstate/api/api.go

@@ -35,7 +35,7 @@ type ExistingManifests struct {
 	CrdError error
 }
 
-func (em ExistingManifests) State(mf apimanifests.Manifests) []objectstate.ObjectState {
+func (em *ExistingManifests) State(mf apimanifests.Manifests) []objectstate.ObjectState {
 	return []objectstate.ObjectState{
 		{
 			Existing: em.Existing.Crd,
@@ -47,13 +47,13 @@ func (em ExistingManifests) State(mf apimanifests.Manifests) []objectstate.Objec
 	}
 }
 
-func FromClient(ctx context.Context, cli client.Client, plat platform.Platform, mf apimanifests.Manifests) ExistingManifests {
+func FromClient(ctx context.Context, cli client.Client, plat platform.Platform, mf apimanifests.Manifests) *ExistingManifests {
 	ret := ExistingManifests{
 		Existing: apimanifests.New(plat),
 	}
 	crd := apiextensionv1.CustomResourceDefinition{}
 	if ret.CrdError = cli.Get(ctx, client.ObjectKeyFromObject(mf.Crd), &crd); ret.CrdError == nil {
 		ret.Existing.Crd = &crd
 	}
-	return ret
+	return &ret
 }

pkg/objectstate/cfg/cfg.go

@@ -37,7 +37,7 @@ type ExistingManifests struct {
 	ConfigError error
 }
 
-func (em ExistingManifests) State(mf Manifests) []objectstate.ObjectState {
+func (em *ExistingManifests) State(mf Manifests) []objectstate.ObjectState {
 	return []objectstate.ObjectState{
 		{
 			Existing: em.Existing.Config,
@@ -49,7 +49,7 @@ func (em ExistingManifests) State(mf Manifests) []objectstate.ObjectState {
 	}
 }
 
-func FromClient(ctx context.Context, cli client.Client, namespace, name string) ExistingManifests {
+func FromClient(ctx context.Context, cli client.Client, namespace, name string) *ExistingManifests {
 	ret := ExistingManifests{}
 	key := client.ObjectKey{
 		Name:      name,
@@ -59,5 +59,5 @@ func FromClient(ctx context.Context, cli client.Client, namespace, name string)
 	if ret.ConfigError = cli.Get(ctx, key, &config); ret.ConfigError == nil {
 		ret.Existing.Config = &config
 	}
-	return ret
+	return &ret
 }

pkg/objectstate/rte/machineconfigpool.go

@@ -0,0 +1,121 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * Copyright 2025 Red Hat, Inc.
+ */
+
+package rte
+
+import (
+	"context"
+	"fmt"
+
+	appsv1 "k8s.io/api/apps/v1"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+
+	machineconfigv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1"
+
+	nropv1 "github.com/openshift-kni/numaresources-operator/api/numaresourcesoperator/v1"
+	nodegroupv1 "github.com/openshift-kni/numaresources-operator/api/numaresourcesoperator/v1/helper/nodegroup"
+	"github.com/openshift-kni/numaresources-operator/pkg/objectnames"
+	"github.com/openshift-kni/numaresources-operator/pkg/objectstate"
+	"github.com/openshift-kni/numaresources-operator/pkg/objectstate/compare"
+	"github.com/openshift-kni/numaresources-operator/pkg/objectstate/merge"
+)
+
+type machineConfigPoolFinder struct {
+	em        *ExistingManifests
+	instance  *nropv1.NUMAResourcesOperator
+	namespace string
+}
+
+func (obj machineConfigPoolFinder) Name() string {
+	return "machineConfigPool"
+}
+
+func (obj machineConfigPoolFinder) UpdateFromClient(ctx context.Context, cli client.Client, tree nodegroupv1.Tree) {
+	for _, mcp := range tree.MachineConfigPools {
+		generatedName := objectnames.GetComponentName(obj.instance.Name, mcp.Name)
+		key := client.ObjectKey{
+			Name:      generatedName,
+			Namespace: obj.namespace,
+		}
+		ds := &appsv1.DaemonSet{}
+		dsm := daemonSetManifest{}
+		if dsm.daemonSetError = cli.Get(ctx, key, ds); dsm.daemonSetError == nil {
+			dsm.daemonSet = ds
+		}
+		obj.em.daemonSets[generatedName] = dsm
+
+		mcName := objectnames.GetMachineConfigName(obj.instance.Name, mcp.Name)
+		mckey := client.ObjectKey{
+			Name: mcName,
+		}
+		mc := &machineconfigv1.MachineConfig{}
+		mcm := machineConfigManifest{}
+		if mcm.machineConfigError = cli.Get(ctx, mckey, mc); mcm.machineConfigError == nil {
+			mcm.machineConfig = mc
+		}
+		obj.em.machineConfigs[mcName] = mcm
+	}
+}
+
+func (obj machineConfigPoolFinder) FindState(mf Manifests, tree nodegroupv1.Tree) []objectstate.ObjectState {
+	var ret []objectstate.ObjectState
+	for _, mcp := range tree.MachineConfigPools {
+		var existingDs client.Object
+		var loadError error
+
+		generatedName := objectnames.GetComponentName(obj.instance.Name, mcp.Name)
+		existingDaemonSet, ok := obj.em.daemonSets[generatedName]
+		if ok {
+			existingDs = existingDaemonSet.daemonSet
+			loadError = existingDaemonSet.daemonSetError
+		} else {
+			loadError = fmt.Errorf("failed to find daemon set %s/%s", mf.Core.DaemonSet.Namespace, mf.Core.DaemonSet.Name)
+		}
+
+		desiredDaemonSet := mf.Core.DaemonSet.DeepCopy()
+		desiredDaemonSet.Name = generatedName
+
+		var updateError error
+		if mcp.Spec.NodeSelector != nil {
+			desiredDaemonSet.Spec.Template.Spec.NodeSelector = mcp.Spec.NodeSelector.MatchLabels
+		} else {
+			updateError = fmt.Errorf("the machine config pool %q does not have node selector", mcp.Name)
+		}
+
+		gdm := GeneratedDesiredManifest{
+			ClusterPlatform:       obj.em.plat,
+			MachineConfigPool:     mcp.DeepCopy(),
+			NodeGroup:             tree.NodeGroup.DeepCopy(),
+			DaemonSet:             desiredDaemonSet,
+			IsCustomPolicyEnabled: obj.em.customPolicyEnabled,
+		}
+
+		err := obj.em.updater(mcp.Name, &gdm)
+		if err != nil {
+			updateError = fmt.Errorf("daemonset for MCP %q: update failed: %w", mcp.Name, err)
+		}
+
+		ret = append(ret, objectstate.ObjectState{
+			Existing:    existingDs,
+			Error:       loadError,
+			UpdateError: updateError,
+			Desired:     desiredDaemonSet,
+			Compare:     compare.Object,
+			Merge:       merge.ObjectForUpdate,
+		})
+	}
+	return ret
+}

pkg/objectstate/rte/nodegroup.go

@@ -0,0 +1,104 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * Copyright 2025 Red Hat, Inc.
+ */
+
+package rte
+
+import (
+	"context"
+	"fmt"
+
+	appsv1 "k8s.io/api/apps/v1"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+
+	nropv1 "github.com/openshift-kni/numaresources-operator/api/numaresourcesoperator/v1"
+	nodegroupv1 "github.com/openshift-kni/numaresources-operator/api/numaresourcesoperator/v1/helper/nodegroup"
+	"github.com/openshift-kni/numaresources-operator/pkg/objectnames"
+	"github.com/openshift-kni/numaresources-operator/pkg/objectstate"
+	"github.com/openshift-kni/numaresources-operator/pkg/objectstate/compare"
+	"github.com/openshift-kni/numaresources-operator/pkg/objectstate/merge"
+)
+
+type nodeGroupFinder struct {
+	em        *ExistingManifests
+	instance  *nropv1.NUMAResourcesOperator
+	namespace string
+}
+
+func (obj nodeGroupFinder) Name() string {
+	return "nodeGroup"
+}
+
+func (obj nodeGroupFinder) UpdateFromClient(ctx context.Context, cli client.Client, tree nodegroupv1.Tree) {
+	generatedName := objectnames.GetComponentName(obj.instance.Name, *tree.NodeGroup.PoolName)
+	key := client.ObjectKey{
+		Name:      generatedName,
+		Namespace: obj.namespace,
+	}
+	ds := &appsv1.DaemonSet{}
+	dsm := daemonSetManifest{}
+	if dsm.daemonSetError = cli.Get(ctx, key, ds); dsm.daemonSetError == nil {
+		dsm.daemonSet = ds
+	}
+	obj.em.daemonSets[generatedName] = dsm
+}
+
+func (obj nodeGroupFinder) FindState(mf Manifests, tree nodegroupv1.Tree) []objectstate.ObjectState {
+	var ret []objectstate.ObjectState
+	var existingDs client.Object
+	var loadError error
+
+	poolName := *tree.NodeGroup.PoolName
+
+	generatedName := objectnames.GetComponentName(obj.instance.Name, poolName)
+	existingDaemonSet, ok := obj.em.daemonSets[generatedName]
+	if ok {
+		existingDs = existingDaemonSet.daemonSet
+		loadError = existingDaemonSet.daemonSetError
+	} else {
+		loadError = fmt.Errorf("failed to find daemon set %s/%s", mf.Core.DaemonSet.Namespace, mf.Core.DaemonSet.Name)
+	}
+
+	desiredDaemonSet := mf.Core.DaemonSet.DeepCopy()
+	desiredDaemonSet.Name = generatedName
+
+	var updateError error
+	desiredDaemonSet.Spec.Template.Spec.NodeSelector = map[string]string{
+		HyperShiftNodePoolLabel: poolName,
+	}
+
+	gdm := GeneratedDesiredManifest{
+		ClusterPlatform:       obj.em.plat,
+		MachineConfigPool:     nil,
+		NodeGroup:             tree.NodeGroup.DeepCopy(),
+		DaemonSet:             desiredDaemonSet,
+		IsCustomPolicyEnabled: obj.em.customPolicyEnabled,
+	}
+
+	err := obj.em.updater(poolName, &gdm)
+	if err != nil {
+		updateError = fmt.Errorf("daemonset for pool %q: update failed: %w", poolName, err)
+	}
+
+	ret = append(ret, objectstate.ObjectState{
+		Existing:    existingDs,
+		Error:       loadError,
+		UpdateError: updateError,
+		Desired:     desiredDaemonSet,
+		Compare:     compare.Object,
+		Merge:       merge.ObjectForUpdate,
+	})
+	return ret
+}