next

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

Author: andreaskaris

apis/v1alpha1/config_types.go

@@ -18,7 +18,6 @@ package v1alpha1
 
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/utils/ptr"
 )
 
 // +genclient
@@ -127,30 +126,3 @@ type ConfigComponentStatuses struct {
 	// +optional
 	Scc *ConfigComponentStatus `json:"scc,omitempty"`
 }
-
-// Equals compares two ConfigComponentStatuses instances for equality.
-func (ccs ConfigComponentStatuses) Equals(c ConfigComponentStatuses) bool {
-	return ptr.Equal(ccs.ConfigMap, c.ConfigMap) &&
-		ptr.Equal(ccs.DaemonSet, c.DaemonSet) &&
-		ptr.Equal(ccs.MetricsProxyDaemonSet, c.MetricsProxyDaemonSet) &&
-		ptr.Equal(ccs.CsiDriver, c.CsiDriver) &&
-		ptr.Equal(ccs.Scc, c.Scc)
-}
-
-// AnyComponentProgressing returns true if any component is in the Progressing state.
-func (ccs ConfigComponentStatuses) AnyComponentProgressing(isOpenShift bool) bool {
-	return ccs.ConfigMap != nil && *ccs.ConfigMap == ConfigStatusProgressing ||
-		ccs.DaemonSet != nil && *ccs.DaemonSet == ConfigStatusProgressing ||
-		ccs.MetricsProxyDaemonSet != nil && *ccs.MetricsProxyDaemonSet == ConfigStatusProgressing ||
-		ccs.CsiDriver != nil && *ccs.CsiDriver == ConfigStatusProgressing ||
-		(isOpenShift && ccs.Scc != nil && *ccs.Scc == ConfigStatusProgressing)
-}
-
-// AllComponentsReady returns true if all components are in the Ready state.
-func (ccs ConfigComponentStatuses) AllComponentsReady(isOpenShift bool) bool {
-	return ccs.ConfigMap != nil && *ccs.ConfigMap == ConfigStatusReady &&
-		ccs.DaemonSet != nil && *ccs.DaemonSet == ConfigStatusReady &&
-		ccs.MetricsProxyDaemonSet != nil && *ccs.MetricsProxyDaemonSet == ConfigStatusReady &&
-		ccs.CsiDriver != nil && *ccs.CsiDriver == ConfigStatusReady &&
-		(!isOpenShift || ccs.Scc != nil && *ccs.Scc == ConfigStatusReady)
-}

controllers/bpfman-operator/config.go

@@ -288,7 +288,7 @@ func (r *BpfmanConfigReconciler) setStatusConditions(ctx context.Context, config
 	}
 
 	// If none of the components changed, do not update anything for the status.
-	if config.Status.Components != nil && statuses.Equals(*config.Status.Components) {
+	if config.Status.Components != nil && ccsEquals(statuses, *config.Status.Components) {
 		return nil
 	}
 
@@ -297,7 +297,7 @@ func (r *BpfmanConfigReconciler) setStatusConditions(ctx context.Context, config
 
 	// Set conditions, next.
 	switch {
-	case statuses.AnyComponentProgressing(r.IsOpenshift):
+	case ccsAnyComponentProgressing(statuses, r.IsOpenshift):
 		meta.SetStatusCondition(&config.Status.Conditions, metav1.Condition{
 			Type:    internal.ConfigConditionProgressing,
 			Status:  metav1.ConditionTrue,
@@ -311,7 +311,7 @@ func (r *BpfmanConfigReconciler) setStatusConditions(ctx context.Context, config
 			Message: internal.ConfigMessageProgressing,
 		})
 		r.Recorder.Event(config, "Normal", internal.ConfigReasonProgressing, internal.ConfigMessageProgressing)
-	case statuses.AllComponentsReady(r.IsOpenshift):
+	case ccsAllComponentsReady(statuses, r.IsOpenshift):
 		meta.SetStatusCondition(&config.Status.Conditions, metav1.Condition{
 			Type:    internal.ConfigConditionProgressing,
 			Status:  metav1.ConditionFalse,
@@ -604,3 +604,30 @@ func healthProbeAddress(healthProbePort int) string {
 	}
 	return fmt.Sprintf(":%d", healthProbePort)
 }
+
+// ccsEquals compares two ConfigComponentStatuses instances for equality.
+func ccsEquals(ccs, c v1alpha1.ConfigComponentStatuses) bool {
+	return ptr.Equal(ccs.ConfigMap, c.ConfigMap) &&
+		ptr.Equal(ccs.DaemonSet, c.DaemonSet) &&
+		ptr.Equal(ccs.MetricsProxyDaemonSet, c.MetricsProxyDaemonSet) &&
+		ptr.Equal(ccs.CsiDriver, c.CsiDriver) &&
+		ptr.Equal(ccs.Scc, c.Scc)
+}
+
+// ccsAnyComponentProgressing returns true if any component is in the Progressing state.
+func ccsAnyComponentProgressing(ccs v1alpha1.ConfigComponentStatuses, isOpenShift bool) bool {
+	return ccs.ConfigMap != nil && *ccs.ConfigMap == v1alpha1.ConfigStatusProgressing ||
+		ccs.DaemonSet != nil && *ccs.DaemonSet == v1alpha1.ConfigStatusProgressing ||
+		ccs.MetricsProxyDaemonSet != nil && *ccs.MetricsProxyDaemonSet == v1alpha1.ConfigStatusProgressing ||
+		ccs.CsiDriver != nil && *ccs.CsiDriver == v1alpha1.ConfigStatusProgressing ||
+		(isOpenShift && ccs.Scc != nil && *ccs.Scc == v1alpha1.ConfigStatusProgressing)
+}
+
+// ccsAllComponentsReady returns true if all components are in the Ready state.
+func ccsAllComponentsReady(ccs v1alpha1.ConfigComponentStatuses, isOpenShift bool) bool {
+	return ccs.ConfigMap != nil && *ccs.ConfigMap == v1alpha1.ConfigStatusReady &&
+		ccs.DaemonSet != nil && *ccs.DaemonSet == v1alpha1.ConfigStatusReady &&
+		ccs.MetricsProxyDaemonSet != nil && *ccs.MetricsProxyDaemonSet == v1alpha1.ConfigStatusReady &&
+		ccs.CsiDriver != nil && *ccs.CsiDriver == v1alpha1.ConfigStatusReady &&
+		(!isOpenShift || ccs.Scc != nil && *ccs.Scc == v1alpha1.ConfigStatusReady)
+}

controllers/bpfman-operator/config_test.go

@@ -699,7 +699,7 @@ func testStatusSet(ctx context.Context, cl client.Client, configName string, isO
 	}
 
 	if bpfmanConfig.Status.Components == nil ||
-		!bpfmanConfig.Status.Components.Equals(expectedComponentStatuses) {
+		!ccsEquals(*bpfmanConfig.Status.Components, expectedComponentStatuses) {
 		got := fmt.Sprintf("%v", bpfmanConfig.Status.Components)
 		want := fmt.Sprintf("%v", expectedComponentStatuses)
 		if b, err := json.Marshal(bpfmanConfig.Status.Components); err == nil {

test/lifecycle/lifecycle_test.go

@@ -804,6 +804,6 @@ func waitForAvailable(ctx context.Context, isOpenShift bool) error {
 		if !testutil.ContainsCondition(bpfmanConfig.Status.Conditions, availableCondition) {
 			return false, nil
 		}
-		return bpfmanConfig.Status.Components != nil && bpfmanConfig.Status.Components.AllComponentsReady(isOpenShift), nil
+		return bpfmanConfig.Status.Components != nil && bpfmanConfig.Status.Components.CcsAllComponentsReady(isOpenShift), nil
 	})
 }