Add lifecycle test validation for Config default values

Add checkResourcesInDesiredState() function to verify that the default
health probe port (8175) is correctly applied to bpfman and metrics
proxy DaemonSets when not explicitly set in the Config spec.

This test ensures the default value handling introduced in the API
standards compliance changes works correctly at runtime.

Signed-off-by: Andreas Karis <[email protected]>

Author: andreaskaris

test/lifecycle/lifecycle_test.go

@@ -21,7 +21,6 @@ import (
 	bpfmaniov1alpha1 "github.com/bpfman/bpfman-operator/apis/v1alpha1"
 	"github.com/bpfman/bpfman-operator/internal"
 	bpfmanHelpers "github.com/bpfman/bpfman-operator/pkg/helpers"
-	"github.com/bpfman/bpfman-operator/test/testutil"
 	osv1 "github.com/openshift/api/security/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
@@ -60,7 +59,6 @@ millisec_delay = 10000
 allow_unsigned = true
 verify_enabled = true`,
 			Agent: v1alpha1.AgentSpec{
-				HealthProbePort: 8175,
 				Image:    "quay.io/bpfman/bpfman-agent:latest",
 				LogLevel: "debug", // Changed from info to debug
 			},
@@ -131,8 +129,8 @@ func TestLifecycle(t *testing.T) {
 	if err := waitForResourceCreation(ctx); err != nil {
 		t.Fatalf("Failed to ensure resources: %q", err)
 	}
-	if err := waitForAvailable(ctx, isOpenShift); err != nil {
-		t.Fatalf("Config never reported status available: %q", err)
+	if err := checkResourcesInDesiredState(ctx); err != nil {
+		t.Fatalf("Failed to ensure resources: %q", err)
 	}
 
 	// Test deleting resources.
@@ -787,37 +785,36 @@ func podHasContainerArg(ds *appsv1.DaemonSet, arg string) bool {
 	return false
 }
 
-// waitForAvailable waits until the bpfman Config shows "Available" status conditions,
-// indicating that all components are ready and reconciliation is complete.
-func waitForAvailable(ctx context.Context, isOpenShift bool) error {
-	return waitUntilCondition(ctx, func() (bool, error) {
-		bpfmanConfig := &v1alpha1.Config{}
-		if err := runtimeClient.Get(ctx, types.NamespacedName{Name: internal.BpfmanConfigName}, bpfmanConfig); err != nil {
-			if errors.IsNotFound(err) {
-				return false, nil
-			}
-			return false, err
-		}
-		progressingCondition := metav1.Condition{
-			Type:    internal.ConfigConditionProgressing,
-			Status:  metav1.ConditionFalse,
-			Reason:  internal.ConfigReasonAvailable,
-			Message: internal.ConfigMessageAvailable,
-		}
-		availableCondition := metav1.Condition{
-			Type:    internal.ConfigConditionAvailable,
-			Status:  metav1.ConditionTrue,
-			Reason:  internal.ConfigReasonAvailable,
-			Message: internal.ConfigMessageAvailable,
-		}
-		if !testutil.ContainsCondition(bpfmanConfig.Status.Conditions, progressingCondition) {
-			return false, nil
-		}
-		if !testutil.ContainsCondition(bpfmanConfig.Status.Conditions, availableCondition) {
-			return false, nil
-		}
-		componentsReady := bpfmanConfig.Status.Components != nil &&
-			internal.CCSAllComponentsReady(bpfmanConfig.Status.Components, isOpenShift)
-		return componentsReady, nil
-	})
+// checkResourcesInDesiredState makes sure that all resources are in the desired state.
+// Right now, the only implemented validation in this function is a check for the health probe port.
+// Returns error if timeout is reached or if context is cancelled.
+func checkResourcesInDesiredState(ctx context.Context) error {
+	// Check DaemonSet is in desired state.
+	ds := &appsv1.DaemonSet{}
+	dsKey := types.NamespacedName{Name: internal.BpfmanDsName, Namespace: internal.BpfmanNamespace}
+	if err := runtimeClient.Get(ctx, dsKey, ds); err != nil && errors.IsNotFound(err) || ds.Status.NumberAvailable == 0 {
+		return nil
+	} else if err != nil {
+		return err
+	}
+
+	arg := "--health-probe-bind-address=:8175"
+	// Check that the bpfman DaemonSet has the health probe bind address argument.
+	if !podHasContainerArg(ds, arg) {
+		return fmt.Errorf("bpfman DaemonSet missing argument %q", arg)
+	}
+	// Check Metrics Proxy DaemonSet is in desired state.
+	mds := &appsv1.DaemonSet{}
+	mdsKey := types.NamespacedName{Name: internal.BpfmanMetricsProxyDsName, Namespace: internal.BpfmanNamespace}
+	if err := runtimeClient.Get(ctx, mdsKey, mds); err != nil && errors.IsNotFound(err) || mds.Status.NumberAvailable == 0 {
+		return nil
+	} else if err != nil {
+		return err
+	}
+	// Check that the metrics proxy DaemonSet has the health probe bind address argument.
+	if !podHasContainerArg(mds, arg) {
+		return fmt.Errorf("metrics proxy DaemonSet missing argement %q", arg)
+	}
+
+	return nil
 }