controllers: abstract status setting logic

pkg/controllers/common/conditions.go

@@ -0,0 +1,36 @@
+package common
+
+import (
+	"strings"
+
+	"k8s.io/apimachinery/pkg/util/sets"
+
+	operatorv1 "github.com/openshift/api/operator/v1"
+	"github.com/openshift/library-go/pkg/operator/v1helpers"
+)
+
+func UpdateControllerConditions(operatorClient v1helpers.OperatorClient, allConditionNames sets.String, updatedConditions []operatorv1.OperatorCondition) error {
+	updateConditionFuncs := []v1helpers.UpdateStatusFunc{}
+
+	for _, conditionType := range allConditionNames.List() {
+		// clean up existing updatedConditions
+		newCondition := operatorv1.OperatorCondition{
+			Type:   conditionType,
+			Status: operatorv1.ConditionFalse,
+		}
+		if strings.HasSuffix(conditionType, "Available") {
+			newCondition.Status = operatorv1.ConditionTrue
+		}
+
+		if condition := v1helpers.FindOperatorCondition(updatedConditions, conditionType); condition != nil {
+			newCondition = *condition
+		}
+		updateConditionFuncs = append(updateConditionFuncs, v1helpers.UpdateConditionFn(newCondition))
+	}
+
+	if _, _, err := v1helpers.UpdateStatus(operatorClient, updateConditionFuncs...); err != nil {
+		return err
+	}
+
+	return nil
+}

pkg/controllers/deployment/deployment_controller.go

@@ -189,28 +189,7 @@ func (c *deploymentController) sync(ctx context.Context, syncContext factory.Syn
 		}
 	}
 
-	updateConditionFuncs := []v1helpers.UpdateStatusFunc{}
-
-	for _, conditionType := range knownConditionNames.List() {
-		// clean up existing foundConditions
-		updatedCondition := operatorv1.OperatorCondition{
-			Type:   conditionType,
-			Status: operatorv1.ConditionFalse,
-		}
-		if strings.HasSuffix(conditionType, "Available") {
-			updatedCondition.Status = operatorv1.ConditionTrue
-		}
-		if condition := v1helpers.FindOperatorCondition(foundConditions, conditionType); condition != nil {
-			updatedCondition = *condition
-		}
-		updateConditionFuncs = append(updateConditionFuncs, v1helpers.UpdateConditionFn(updatedCondition))
-	}
-
-	if _, _, err := v1helpers.UpdateStatus(c.operatorClient, updateConditionFuncs...); err != nil {
-		return err
-	}
-
-	return nil
+	return common.UpdateControllerConditions(c.operatorClient, knownConditionNames, foundConditions)
 }
 
 func (c *deploymentController) getAuthConfig(ctx context.Context) (*operatorv1.Authentication, []operatorv1.OperatorCondition) {

pkg/controllers/ingressstate/ingress_state_controller.go

@@ -12,6 +12,7 @@ import (
 	"time"
 
 	operatorv1 "github.com/openshift/api/operator/v1"
+	"github.com/openshift/cluster-authentication-operator/pkg/controllers/common"
 	"github.com/openshift/library-go/pkg/controller/factory"
 	"github.com/openshift/library-go/pkg/operator/events"
 	"github.com/openshift/library-go/pkg/operator/v1helpers"
@@ -103,20 +104,7 @@ func (c *ingressStateController) sync(ctx context.Context, syncCtx factory.SyncC
 		degradedConditions = []operatorv1.OperatorCondition{*subsetCondition}
 	}
 
-	updateConditionFuncs := []v1helpers.UpdateStatusFunc{}
-	for _, conditionName := range degradedConditionTypes.UnsortedList() {
-		// Ensure that missing degraded conditions are cleared
-		updatedCondition := operatorv1.OperatorCondition{
-			Type:   conditionName,
-			Status: operatorv1.ConditionFalse,
-		}
-		if condition := v1helpers.FindOperatorCondition(degradedConditions, conditionName); condition != nil {
-			updatedCondition = *condition
-		}
-		updateConditionFuncs = append(updateConditionFuncs, v1helpers.UpdateConditionFn(updatedCondition))
-	}
-	_, _, err = v1helpers.UpdateStatus(c.operatorClient, updateConditionFuncs...)
-	return err
+	return common.UpdateControllerConditions(c.operatorClient, degradedConditionTypes, degradedConditions)
 }
 
 // unhealthyPodMessages returns a slice of messages intended to aid in the

pkg/controllers/metadata/metadata_controller.go

@@ -94,25 +94,7 @@ func (c *metadataController) sync(ctx context.Context, syncCtx factory.SyncConte
 		foundConditions = append(foundConditions, c.handleAuthConfig(ctx)...)
 	}
 
-	updateConditionFuncs := []v1helpers.UpdateStatusFunc{}
-
-	for _, conditionType := range knownConditionNames.List() {
-		// clean up existing foundConditions
-		updatedCondition := operatorv1.OperatorCondition{
-			Type:   conditionType,
-			Status: operatorv1.ConditionFalse,
-		}
-		if condition := v1helpers.FindOperatorCondition(foundConditions, conditionType); condition != nil {
-			updatedCondition = *condition
-		}
-		updateConditionFuncs = append(updateConditionFuncs, v1helpers.UpdateConditionFn(updatedCondition))
-	}
-
-	if _, _, err := v1helpers.UpdateStatus(c.operatorClient, updateConditionFuncs...); err != nil {
-		return err
-	}
-
-	return nil
+	return common.UpdateControllerConditions(c.operatorClient, knownConditionNames, foundConditions)
 }
 
 func (c *metadataController) handleOAuthMetadataConfigMap(ctx context.Context, recorder events.Recorder) []operatorv1.OperatorCondition {

pkg/controllers/payload/payload_config_controller.go

@@ -149,25 +149,7 @@ func (c *payloadConfigController) sync(ctx context.Context, syncContext factory.
 	oauthConfigConditions := c.handleOAuthConfig(operatorConfig, route, service, syncContext.Recorder())
 	foundConditions = append(foundConditions, oauthConfigConditions...)
 
-	updateConditionFuncs := []v1helpers.UpdateStatusFunc{}
-
-	for _, conditionType := range knownConditionNames.List() {
-		// clean up existing foundConditions
-		updatedCondition := operatorv1.OperatorCondition{
-			Type:   conditionType,
-			Status: operatorv1.ConditionFalse,
-		}
-		if condition := v1helpers.FindOperatorCondition(foundConditions, conditionType); condition != nil {
-			updatedCondition = *condition
-		}
-		updateConditionFuncs = append(updateConditionFuncs, v1helpers.UpdateConditionFn(updatedCondition))
-	}
-
-	if _, _, err := v1helpers.UpdateStatus(c.operatorClient, updateConditionFuncs...); err != nil {
-		return err
-	}
-
-	return nil
+	return common.UpdateControllerConditions(c.operatorClient, knownConditionNames, foundConditions)
 }
 
 func (c *payloadConfigController) handleOAuthConfig(operatorConfig *operatorv1.Authentication, route *routev1.Route, service *corev1.Service, recorder events.Recorder) []operatorv1.OperatorCondition {

pkg/controllers/readiness/wellknown_ready_controller.go

@@ -10,7 +10,6 @@ import (
 	"os"
 	"reflect"
 	"strconv"
-	"strings"
 	"sync"
 	"time"
 
@@ -119,26 +118,7 @@ func (c *wellKnownReadyController) sync(ctx context.Context, controllerContext f
 		}
 	}
 
-	updateConditionFuncs := []v1helpers.UpdateStatusFunc{}
-	for _, conditionType := range knownConditionNames.List() {
-		// clean up existing foundConditions
-		updatedCondition := operatorv1.OperatorCondition{
-			Type:   conditionType,
-			Status: operatorv1.ConditionFalse,
-		}
-		if strings.HasSuffix(conditionType, "Available") {
-			updatedCondition.Status = operatorv1.ConditionTrue
-		}
-		if condition := v1helpers.FindOperatorCondition(foundConditions, conditionType); condition != nil {
-			updatedCondition = *condition
-		}
-		updateConditionFuncs = append(updateConditionFuncs, v1helpers.UpdateConditionFn(updatedCondition))
-	}
-	if _, _, err := v1helpers.UpdateStatus(c.operatorClient, updateConditionFuncs...); err != nil {
-		return err
-	}
-
-	return nil
+	return common.UpdateControllerConditions(c.operatorClient, knownConditionNames, foundConditions)
 }
 
 func (c *wellKnownReadyController) isWellknownEndpointsReady(authConfig *configv1.Authentication, route *routev1.Route) (bool, string, error) {

pkg/controllers/serviceca/service_ca_controller.go

@@ -70,25 +70,7 @@ func (c *serviceCAController) sync(ctx context.Context, syncCtx factory.SyncCont
 		foundConditions = append(foundConditions, serviceCAConditions...)
 	}
 
-	updateConditionFuncs := []v1helpers.UpdateStatusFunc{}
-
-	for _, conditionType := range knownConditionNames.List() {
-		// clean up existing foundConditions
-		updatedCondition := operatorv1.OperatorCondition{
-			Type:   conditionType,
-			Status: operatorv1.ConditionFalse,
-		}
-		if condition := v1helpers.FindOperatorCondition(foundConditions, conditionType); condition != nil {
-			updatedCondition = *condition
-		}
-		updateConditionFuncs = append(updateConditionFuncs, v1helpers.UpdateConditionFn(updatedCondition))
-	}
-
-	if _, _, err := v1helpers.UpdateStatus(c.operatorClient, updateConditionFuncs...); err != nil {
-		return err
-	}
-
-	return nil
+	return common.UpdateControllerConditions(c.operatorClient, knownConditionNames, foundConditions)
 }
 
 func getServiceCAConfig() *corev1.ConfigMap {

pkg/controllers/targetversion/target_version_controller.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"fmt"
 	"os"
-	"strings"
 	"time"
 
 	appsv1 "k8s.io/api/apps/v1"
@@ -108,34 +107,13 @@ func (c *targetVersionController) sync(ctx context.Context, syncContext factory.
 
 	foundConditions = append(foundConditions, c.oauthClientsReady(ctx)...)
 
-	updateConditionFuncs := []v1helpers.UpdateStatusFunc{}
-
 	// We achieved desired state
 	if len(foundConditions) == 0 {
 		c.setVersion("operator", operatorVersion)
 		c.setVersion("oauth-openshift", operandVersion)
 	}
 
-	for _, conditionType := range knownConditionNames.List() {
-		// clean up existing foundConditions
-		updatedCondition := operatorv1.OperatorCondition{
-			Type:   conditionType,
-			Status: operatorv1.ConditionFalse,
-		}
-		if strings.HasSuffix(conditionType, "Available") {
-			updatedCondition.Status = operatorv1.ConditionTrue
-		}
-		if condition := v1helpers.FindOperatorCondition(foundConditions, conditionType); condition != nil {
-			updatedCondition = *condition
-		}
-		updateConditionFuncs = append(updateConditionFuncs, v1helpers.UpdateConditionFn(updatedCondition))
-	}
-
-	if _, _, err := v1helpers.UpdateStatus(c.operatorClient, updateConditionFuncs...); err != nil {
-		return err
-	}
-
-	return nil
+	return common.UpdateControllerConditions(c.operatorClient, knownConditionNames, foundConditions)
 }
 
 func (c *targetVersionController) getRouteSecret() (*corev1.Secret, []operatorv1.OperatorCondition) {