RTE metrics enablement

* Integrating RTE metrics manifests to be deployed by the operator * This adds unit test for metrics components creation Signed-off-by: Ronny Baturov <[email protected]>
openshift-kni · Dec 22, 2024 · cd31919 · cd31919
1 parent 93e5985
commit cd31919
Show file tree

Hide file tree

Showing 2 changed files with 67 additions and 7 deletions.
diff --git a/controllers/numaresourcesoperator_controller.go b/controllers/numaresourcesoperator_controller.go
@@ -64,6 +64,8 @@ import (
 	rtemetricsmanifests "github.com/openshift-kni/numaresources-operator/pkg/metrics/manifests/monitor"
 	"github.com/openshift-kni/numaresources-operator/pkg/objectnames"
 	apistate "github.com/openshift-kni/numaresources-operator/pkg/objectstate/api"
+	"github.com/openshift-kni/numaresources-operator/pkg/objectstate/compare"
+	"github.com/openshift-kni/numaresources-operator/pkg/objectstate/merge"
 	rtestate "github.com/openshift-kni/numaresources-operator/pkg/objectstate/rte"
 	rteupdate "github.com/openshift-kni/numaresources-operator/pkg/objectupdate/rte"
 	"github.com/openshift-kni/numaresources-operator/pkg/status"
@@ -581,6 +583,30 @@ func (r *NUMAResourcesOperatorReconciler) syncNUMAResourcesOperatorResources(ctx
 			return nil, fmt.Errorf("failed to apply (%s) %s/%s: %w", objState.Desired.GetObjectKind().GroupVersionKind(), objState.Desired.GetNamespace(), objState.Desired.GetName(), err)
 		}
 	}
+
+	for _, obj := range r.RTEMetricsManifests.ToObjects() {
+		// Check if the object already exists
+		existingObj := obj.DeepCopyObject().(client.Object)
+		err := r.Client.Get(ctx, client.ObjectKeyFromObject(obj), existingObj)
+		if err != nil && !apierrors.IsNotFound(err) {
+			return nil, fmt.Errorf("failed to get %s/%s: %w", obj.GetNamespace(), obj.GetName(), err)
+		}
+		if apierrors.IsNotFound(err) {
+			err := controllerutil.SetControllerReference(instance, obj, r.Scheme)
+			if err != nil {
+				return nil, fmt.Errorf("failed to set controller reference to %s %s: %w", obj.GetNamespace(), obj.GetName(), err)
+			}
+			err = r.Client.Create(ctx, obj)
+			if err != nil {
+				return nil, fmt.Errorf("failed to create %s/%s: %w", obj.GetNamespace(), obj.GetName(), err)
+			}
+		} else {
+			if err := updateIfNeeded(ctx, existingObj, obj, r.Client); err != nil {
+				return nil, err
+			}
+		}
+	}
+
 	if len(dsPoolPairs) < len(trees) {
 		klog.Warningf("daemonset and tree size mismatch: expected %d got in daemonsets %d", len(trees), len(dsPoolPairs))
 	}
@@ -783,3 +809,21 @@ func getTreesByNodeGroup(ctx context.Context, cli client.Client, nodeGroups []nr
 		return nil, fmt.Errorf("unsupported platform")
 	}
 }
+
+func updateIfNeeded(ctx context.Context, existingObj, desiredObj client.Object, cli client.Client) error {
+	merged, err := merge.MetadataForUpdate(existingObj, desiredObj)
+	if err != nil {
+		return fmt.Errorf("could not merge object %s with existing: %w", desiredObj.GetName(), err)
+	}
+	isEqual, err := compare.Object(existingObj, merged)
+	if err != nil {
+		return fmt.Errorf("could not compare object %s with existing: %w", desiredObj.GetName(), err)
+	}
+	if !isEqual {
+		err = cli.Update(ctx, desiredObj)
+		if err != nil {
+			return fmt.Errorf("failed to update %s/%s: %w", desiredObj.GetNamespace(), desiredObj.GetName(), err)
+		}
+	}
+	return nil
+}
diff --git a/controllers/numaresourcesoperator_controller_test.go b/controllers/numaresourcesoperator_controller_test.go
@@ -49,6 +49,7 @@ import (
 	"github.com/openshift-kni/numaresources-operator/internal/api/annotations"
 	testobjs "github.com/openshift-kni/numaresources-operator/internal/objects"
 	"github.com/openshift-kni/numaresources-operator/pkg/images"
+	rtemetricsmanifests "github.com/openshift-kni/numaresources-operator/pkg/metrics/manifests/monitor"
 	"github.com/openshift-kni/numaresources-operator/pkg/objectnames"
 	"github.com/openshift-kni/numaresources-operator/pkg/objectstate/rte"
 	"github.com/openshift-kni/numaresources-operator/pkg/status"
@@ -70,16 +71,20 @@ func NewFakeNUMAResourcesOperatorReconciler(plat platform.Platform, platVersion
 	if err != nil {
 		return nil, err
 	}
-
+	rtemetricsmanifests, err := rtemetricsmanifests.GetManifests(testNamespace)
+	if err != nil {
+		return nil, err
+	}
 	recorder := record.NewFakeRecorder(bufferSize)
 
 	return &NUMAResourcesOperatorReconciler{
-		Client:       fakeClient,
-		Scheme:       scheme.Scheme,
-		Platform:     plat,
-		APIManifests: apiManifests,
-		RTEManifests: rteManifests,
-		Namespace:    testNamespace,
+		Client:              fakeClient,
+		Scheme:              scheme.Scheme,
+		Platform:            plat,
+		APIManifests:        apiManifests,
+		RTEManifests:        rteManifests,
+		RTEMetricsManifests: rtemetricsmanifests,
+		Namespace:           testNamespace,
 		Images: images.Data{
 			Builtin: testImageSpec,
 		},
@@ -1475,6 +1480,17 @@ var _ = Describe("Test NUMAResourcesOperator Reconcile", func() {
 									Namespace: testNamespace,
 								}
 								Expect(reconciler.Client.Get(context.TODO(), mcp2DSKey, ds)).ToNot(HaveOccurred())
+
+								By("Check All RTE metrics components are created")
+								for _, obj := range reconciler.RTEMetricsManifests.ToObjects() {
+									objectKey := client.ObjectKeyFromObject(obj)
+									switch obj.(type) {
+									case *corev1.Service:
+										service := &corev1.Service{}
+										Expect(reconciler.Client.Get(context.TODO(), objectKey, service)).ToNot(HaveOccurred())
+									default:
+									}
+								}
 							})
 							When("daemonsets are ready", func() {
 								var dsDesiredNumberScheduled int32