objectstate: rte: extract helpers

move helpers in per-mode files. This is meant to keep the filesize at bay and to enable future code extraction. No intended change in behavior. Signed-off-by: Francesco Romani <[email protected]> (cherry picked from commit 6668e12)
openshift-kni · Jan 13, 2025 · 21a4b09 · 21a4b09
1 parent 8eebfce
commit 21a4b09
Show file tree

Hide file tree

Showing 3 changed files with 227 additions and 147 deletions.
diff --git a/pkg/objectstate/rte/machineconfigpool.go b/pkg/objectstate/rte/machineconfigpool.go
@@ -0,0 +1,111 @@
+/*
+ * 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"
+)
+
+func updateFromClientTreeMachineConfigPool(ret *ExistingManifests, ctx context.Context, cli client.Client, instance *nropv1.NUMAResourcesOperator, tree nodegroupv1.Tree, namespace string) {
+	for _, mcp := range tree.MachineConfigPools {
+		generatedName := objectnames.GetComponentName(instance.Name, mcp.Name)
+		key := client.ObjectKey{
+			Name:      generatedName,
+			Namespace: namespace,
+		}
+		ds := &appsv1.DaemonSet{}
+		dsm := daemonSetManifest{}
+		if dsm.daemonSetError = cli.Get(ctx, key, ds); dsm.daemonSetError == nil {
+			dsm.daemonSet = ds
+		}
+		ret.daemonSets[generatedName] = dsm
+
+		mcName := objectnames.GetMachineConfigName(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
+		}
+		ret.machineConfigs[mcName] = mcm
+	}
+}
+
+func stateFromMachineConfigPools(em *ExistingManifests, 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(em.instance.Name, mcp.Name)
+		existingDaemonSet, ok := 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:       em.plat,
+			MachineConfigPool:     mcp.DeepCopy(),
+			NodeGroup:             tree.NodeGroup.DeepCopy(),
+			DaemonSet:             desiredDaemonSet,
+			IsCustomPolicyEnabled: em.customPolicyEnabled,
+		}
+
+		err := 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
+}
diff --git a/pkg/objectstate/rte/nodegroup.go b/pkg/objectstate/rte/nodegroup.go
@@ -0,0 +1,94 @@
+/*
+ * 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"
+)
+
+func updateFromClientTreeNodeGroup(ret *ExistingManifests, ctx context.Context, cli client.Client, instance *nropv1.NUMAResourcesOperator, tree nodegroupv1.Tree, namespace string) {
+	generatedName := objectnames.GetComponentName(instance.Name, *tree.NodeGroup.PoolName)
+	key := client.ObjectKey{
+		Name:      generatedName,
+		Namespace: namespace,
+	}
+	ds := &appsv1.DaemonSet{}
+	dsm := daemonSetManifest{}
+	if dsm.daemonSetError = cli.Get(ctx, key, ds); dsm.daemonSetError == nil {
+		dsm.daemonSet = ds
+	}
+	ret.daemonSets[generatedName] = dsm
+}
+
+func stateFromNodeGroup(em *ExistingManifests, 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(em.instance.Name, poolName)
+	existingDaemonSet, ok := 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:       em.plat,
+		MachineConfigPool:     nil,
+		NodeGroup:             tree.NodeGroup.DeepCopy(),
+		DaemonSet:             desiredDaemonSet,
+		IsCustomPolicyEnabled: em.customPolicyEnabled,
+	}
+
+	err := 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
+}