Merge pull request #1871 from p0lyn0mial/static-pod-fallback-to-ssa

API-1835: migrate static pod fallback to ssa

Author: openshift-merge-bot[bot]

pkg/operator/staticpod/controller/staticpodfallback/static_pod_fallback_condition.go

@@ -6,6 +6,7 @@ import (
 	"time"
 
 	operatorv1 "github.com/openshift/api/operator/v1"
+	applyoperatorv1 "github.com/openshift/client-go/operator/applyconfigurations/operator/v1"
 	"github.com/openshift/library-go/pkg/controller/factory"
 	"github.com/openshift/library-go/pkg/operator/events"
 	"github.com/openshift/library-go/pkg/operator/staticpod/startupmonitor/annotations"
@@ -17,7 +18,8 @@ import (
 
 // staticPodFallbackConditionController knows how to detect and report that a static pod was rolled back to a previous revision
 type staticPodFallbackConditionController struct {
-	operatorClient operatorv1helpers.OperatorClient
+	controllerInstanceName string
+	operatorClient         operatorv1helpers.OperatorClient
 
 	podLabelSelector labels.Selector
 	podLister        corev1listers.PodNamespaceLister
@@ -26,7 +28,8 @@ type staticPodFallbackConditionController struct {
 }
 
 // New creates a controller that detects and report roll back of a static pod
-func New(targetNamespace string,
+func New(
+	instanceName, targetNamespace string,
 	podLabelSelector labels.Selector,
 	operatorClient operatorv1helpers.OperatorClient,
 	kubeInformersForNamespaces operatorv1helpers.KubeInformersForNamespaces,
@@ -39,6 +42,7 @@ func New(targetNamespace string,
 		return nil, fmt.Errorf("StaticPodFallbackConditionController: podLabelSelector cannot be empty")
 	}
 	fd := &staticPodFallbackConditionController{
+		controllerInstanceName:  factory.ControllerInstanceName(instanceName, "StaticPodStateFallback"),
 		operatorClient:          operatorClient,
 		podLabelSelector:        podLabelSelector,
 		podLister:               kubeInformersForNamespaces.InformersFor(targetNamespace).Core().V1().Pods().Lister().Pods(targetNamespace),
@@ -49,18 +53,20 @@ func New(targetNamespace string,
 		ResyncEvery(6*time.Minute).
 		WithInformers(kubeInformersForNamespaces.InformersFor(targetNamespace).Core().V1().Pods().Informer()).
 		ToController(
-			"StaticPodStateFallback", // don't change what is passed here unless you also remove the old FooDegraded condition
+			fd.controllerInstanceName,
 			eventRecorder,
 		), nil
 }
 
 // sync sets/unsets a StaticPodFallbackRevisionDegraded condition if a pod that matches the given label selector is annotated with FallbackForRevision
 func (fd *staticPodFallbackConditionController) sync(ctx context.Context, _ factory.SyncContext) (err error) {
-	degradedCondition := operatorv1.OperatorCondition{Type: "StaticPodFallbackRevisionDegraded", Status: operatorv1.ConditionFalse}
+	degradedCondition := applyoperatorv1.OperatorCondition().WithType("StaticPodFallbackRevisionDegraded")
+	status := applyoperatorv1.OperatorStatus()
 	defer func() {
 		if err == nil {
-			if _, _, updateError := operatorv1helpers.UpdateStatus(ctx, fd.operatorClient, operatorv1helpers.UpdateConditionFn(degradedCondition)); updateError != nil {
-				err = updateError
+			status = status.WithConditions(degradedCondition)
+			if applyError := fd.operatorClient.ApplyOperatorStatus(ctx, fd.controllerInstanceName, status); applyError != nil {
+				err = applyError
 			}
 		}
 	}()
@@ -70,6 +76,7 @@ func (fd *staticPodFallbackConditionController) sync(ctx context.Context, _ fact
 	if enabled, err := fd.startupMonitorEnabledFn(); err != nil {
 		return err
 	} else if !enabled {
+		degradedCondition = degradedCondition.WithStatus(operatorv1.ConditionFalse)
 		return nil
 	}
 
@@ -103,11 +110,13 @@ func (fd *staticPodFallbackConditionController) sync(ctx context.Context, _ fact
 		}
 	}
 
+	// by default, the condition is in a non-degraded state
+	degradedCondition = degradedCondition.WithStatus(operatorv1.ConditionFalse)
 	if len(conditionReason) > 0 || len(conditionMessage) > 0 {
-		degradedCondition.Message = conditionMessage
-		degradedCondition.Reason = conditionReason
-		degradedCondition.Status = operatorv1.ConditionTrue
+		degradedCondition = degradedCondition.
+			WithMessage(conditionMessage).
+			WithReason(conditionReason).
+			WithStatus(operatorv1.ConditionTrue)
 	}
-
 	return nil
 }

pkg/operator/staticpod/controllers.go

@@ -328,6 +328,7 @@ func (b *staticPodOperatorControllerBuilder) ToControllers() (manager.Controller
 		), 1)
 
 		if staticPodFallbackController, err := staticpodfallback.New(
+			b.operandName,
 			b.operandNamespace,
 			b.operandPodLabelSelector,
 			b.staticPodOperatorClient,