make the status controller use SSA

pkg/config/clusteroperator/v1helpers/status.go

@@ -3,57 +3,20 @@ package v1helpers
 import (
 	"bytes"
 	"fmt"
-	"strings"
-	"time"
-
+	applyconfigv1 "github.com/openshift/client-go/config/applyconfigurations/config/v1"
 	"k8s.io/apimachinery/pkg/api/equality"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/diff"
 	"k8s.io/apimachinery/pkg/util/json"
+	"k8s.io/utils/ptr"
+	"strings"
 
 	configv1 "github.com/openshift/api/config/v1"
 )
 
-// SetStatusCondition sets the corresponding condition in conditions to newCondition.
-func SetStatusCondition(conditions *[]configv1.ClusterOperatorStatusCondition, newCondition configv1.ClusterOperatorStatusCondition) {
-	if conditions == nil {
-		conditions = &[]configv1.ClusterOperatorStatusCondition{}
-	}
-	existingCondition := FindStatusCondition(*conditions, newCondition.Type)
-	if existingCondition == nil {
-		newCondition.LastTransitionTime = metav1.NewTime(time.Now())
-		*conditions = append(*conditions, newCondition)
-		return
-	}
-
-	if existingCondition.Status != newCondition.Status {
-		existingCondition.Status = newCondition.Status
-		existingCondition.LastTransitionTime = metav1.NewTime(time.Now())
-	}
-
-	existingCondition.Reason = newCondition.Reason
-	existingCondition.Message = newCondition.Message
-}
-
-// RemoveStatusCondition removes the corresponding conditionType from conditions.
-func RemoveStatusCondition(conditions *[]configv1.ClusterOperatorStatusCondition, conditionType configv1.ClusterStatusConditionType) {
-	if conditions == nil {
-		conditions = &[]configv1.ClusterOperatorStatusCondition{}
-	}
-	newConditions := []configv1.ClusterOperatorStatusCondition{}
-	for _, condition := range *conditions {
-		if condition.Type != conditionType {
-			newConditions = append(newConditions, condition)
-		}
-	}
-
-	*conditions = newConditions
-}
-
 // FindStatusCondition finds the conditionType in conditions.
-func FindStatusCondition(conditions []configv1.ClusterOperatorStatusCondition, conditionType configv1.ClusterStatusConditionType) *configv1.ClusterOperatorStatusCondition {
+func FindStatusCondition(conditions []applyconfigv1.ClusterOperatorStatusConditionApplyConfiguration, conditionType *configv1.ClusterStatusConditionType) *applyconfigv1.ClusterOperatorStatusConditionApplyConfiguration {
 	for i := range conditions {
-		if conditions[i].Type == conditionType {
+		if ptr.Deref(conditions[i].Type, "") == ptr.Deref(conditionType, "") {
 			return &conditions[i]
 		}
 	}
@@ -62,38 +25,52 @@ func FindStatusCondition(conditions []configv1.ClusterOperatorStatusCondition, c
 }
 
 // GetStatusDiff returns a string representing change in condition status in human readable form.
-func GetStatusDiff(oldStatus configv1.ClusterOperatorStatus, newStatus configv1.ClusterOperatorStatus) string {
+func GetStatusDiff(oldStatus, newStatus *applyconfigv1.ClusterOperatorStatusApplyConfiguration) string {
+	switch {
+	case oldStatus == nil && newStatus == nil:
+	case oldStatus != nil && newStatus == nil:
+		return "status was removed"
+	}
 	messages := []string{}
 	for _, newCondition := range newStatus.Conditions {
+		if oldStatus == nil {
+			messages = append(messages, fmt.Sprintf("%s set to %s (%q)", ptr.Deref(newCondition.Type, ""), ptr.Deref(newCondition.Status, ""), ptr.Deref(newCondition.Message, "")))
+			continue
+		}
 		existingStatusCondition := FindStatusCondition(oldStatus.Conditions, newCondition.Type)
 		if existingStatusCondition == nil {
-			messages = append(messages, fmt.Sprintf("%s set to %s (%q)", newCondition.Type, newCondition.Status, newCondition.Message))
+			messages = append(messages, fmt.Sprintf("%s set to %s (%q)", ptr.Deref(newCondition.Type, ""), ptr.Deref(newCondition.Status, ""), ptr.Deref(newCondition.Message, "")))
 			continue
 		}
-		if existingStatusCondition.Status != newCondition.Status {
-			messages = append(messages, fmt.Sprintf("%s changed from %s to %s (%q)", existingStatusCondition.Type, existingStatusCondition.Status, newCondition.Status, newCondition.Message))
+		if ptr.Deref(existingStatusCondition.Status, "") != ptr.Deref(newCondition.Status, "") {
+			messages = append(messages, fmt.Sprintf("%s changed from %s to %s (%q)", ptr.Deref(existingStatusCondition.Type, ""), ptr.Deref(existingStatusCondition.Status, ""), ptr.Deref(newCondition.Status, ""), ptr.Deref(newCondition.Message, "")))
 			continue
 		}
-		if existingStatusCondition.Message != newCondition.Message {
-			messages = append(messages, fmt.Sprintf("%s message changed from %q to %q", existingStatusCondition.Type, existingStatusCondition.Message, newCondition.Message))
+		existingMessage := strings.TrimPrefix(ptr.Deref(existingStatusCondition.Message, ""), "\ufeff")
+		newMessage := strings.TrimPrefix(ptr.Deref(newCondition.Message, ""), "\ufeff")
+		if existingMessage != newMessage {
+			messages = append(messages, fmt.Sprintf("%s message changed from %q to %q", ptr.Deref(existingStatusCondition.Type, ""), existingMessage, newMessage))
 		}
 	}
-	for _, oldCondition := range oldStatus.Conditions {
-		// This should not happen. It means we removed old condition entirely instead of just changing its status
-		if c := FindStatusCondition(newStatus.Conditions, oldCondition.Type); c == nil {
-			messages = append(messages, fmt.Sprintf("%s was removed", oldCondition.Type))
+	if oldStatus != nil {
+		for _, oldCondition := range oldStatus.Conditions {
+			// This should not happen. It means we removed old condition entirely instead of just changing its status
+			if c := FindStatusCondition(newStatus.Conditions, oldCondition.Type); c == nil {
+				messages = append(messages, fmt.Sprintf("%s was removed", ptr.Deref(oldCondition.Type, "")))
+			}
 		}
 	}
 
-	if !equality.Semantic.DeepEqual(oldStatus.RelatedObjects, newStatus.RelatedObjects) {
-		messages = append(messages, fmt.Sprintf("status.relatedObjects changed from %q to %q", oldStatus.RelatedObjects, newStatus.RelatedObjects))
-	}
-	if !equality.Semantic.DeepEqual(oldStatus.Extension, newStatus.Extension) {
-		messages = append(messages, fmt.Sprintf("status.extension changed from %q to %q", oldStatus.Extension, newStatus.Extension))
-	}
-
-	if !equality.Semantic.DeepEqual(oldStatus.Versions, newStatus.Versions) {
-		messages = append(messages, fmt.Sprintf("status.versions changed from %q to %q", oldStatus.Versions, newStatus.Versions))
+	if oldStatus != nil {
+		if !equality.Semantic.DeepEqual(oldStatus.RelatedObjects, newStatus.RelatedObjects) {
+			messages = append(messages, fmt.Sprintf("status.relatedObjects changed from %#v to %#v", oldStatus.RelatedObjects, newStatus.RelatedObjects))
+		}
+		if !equality.Semantic.DeepEqual(oldStatus.Extension, newStatus.Extension) {
+			messages = append(messages, fmt.Sprintf("status.extension changed from %#v to %#v", oldStatus.Extension, newStatus.Extension))
+		}
+		if !equality.Semantic.DeepEqual(oldStatus.Versions, newStatus.Versions) {
+			messages = append(messages, fmt.Sprintf("status.versions changed from %#v to %#v", oldStatus.Versions, newStatus.Versions))
+		}
 	}
 
 	if len(messages) == 0 {

pkg/config/clusteroperator/v1helpers/status_test.go

@@ -1,82 +1,86 @@
 package v1helpers
 
 import (
+	configv1 "github.com/openshift/api/config/v1"
+	"k8s.io/utils/ptr"
 	"reflect"
 	"strings"
 	"testing"
 
-	configv1 "github.com/openshift/api/config/v1"
+	applyconfigv1 "github.com/openshift/client-go/config/applyconfigurations/config/v1"
 )
 
 func TestGetStatusConditionDiff(t *testing.T) {
 	tests := []struct {
 		name             string
-		newConditions    []configv1.ClusterOperatorStatusCondition
-		oldConditions    []configv1.ClusterOperatorStatusCondition
+		newConditions    []applyconfigv1.ClusterOperatorStatusConditionApplyConfiguration
+		oldConditions    []applyconfigv1.ClusterOperatorStatusConditionApplyConfiguration
 		expectedMessages []string
 	}{
 		{
 			name: "new condition",
-			newConditions: []configv1.ClusterOperatorStatusCondition{
+			newConditions: []applyconfigv1.ClusterOperatorStatusConditionApplyConfiguration{
 				{
-					Type:    configv1.RetrievedUpdates,
-					Status:  configv1.ConditionTrue,
-					Message: "test",
+					Type:    ptr.To(configv1.RetrievedUpdates),
+					Status:  ptr.To(configv1.ConditionTrue),
+					Message: ptr.To("test"),
 				},
 			},
 			expectedMessages: []string{`RetrievedUpdates set to True ("test")`},
 		},
 		{
 			name: "condition status change",
-			newConditions: []configv1.ClusterOperatorStatusCondition{
+			newConditions: []applyconfigv1.ClusterOperatorStatusConditionApplyConfiguration{
 				{
-					Type:    configv1.RetrievedUpdates,
-					Status:  configv1.ConditionFalse,
-					Message: "test",
+					Type:    ptr.To(configv1.RetrievedUpdates),
+					Status:  ptr.To(configv1.ConditionFalse),
+					Message: ptr.To("test"),
 				},
 			},
-			oldConditions: []configv1.ClusterOperatorStatusCondition{
+			oldConditions: []applyconfigv1.ClusterOperatorStatusConditionApplyConfiguration{
 				{
-					Type:    configv1.RetrievedUpdates,
-					Status:  configv1.ConditionTrue,
-					Message: "test",
+					Type:    ptr.To(configv1.RetrievedUpdates),
+					Status:  ptr.To(configv1.ConditionTrue),
+					Message: ptr.To("test"),
 				},
 			},
 			expectedMessages: []string{`RetrievedUpdates changed from True to False ("test")`},
 		},
 		{
 			name: "condition message change",
-			newConditions: []configv1.ClusterOperatorStatusCondition{
+			newConditions: []applyconfigv1.ClusterOperatorStatusConditionApplyConfiguration{
 				{
-					Type:    configv1.RetrievedUpdates,
-					Status:  configv1.ConditionTrue,
-					Message: "foo",
+					Type:    ptr.To(configv1.RetrievedUpdates),
+					Status:  ptr.To(configv1.ConditionTrue),
+					Message: ptr.To("foo"),
 				},
 			},
-			oldConditions: []configv1.ClusterOperatorStatusCondition{
+			oldConditions: []applyconfigv1.ClusterOperatorStatusConditionApplyConfiguration{
 				{
-					Type:    configv1.RetrievedUpdates,
-					Status:  configv1.ConditionTrue,
-					Message: "bar",
+					Type:    ptr.To(configv1.RetrievedUpdates),
+					Status:  ptr.To(configv1.ConditionTrue),
+					Message: ptr.To("bar"),
 				},
 			},
 			expectedMessages: []string{`RetrievedUpdates message changed from "bar" to "foo"`},
 		},
 		{
 			name: "condition message deleted",
-			oldConditions: []configv1.ClusterOperatorStatusCondition{
+			oldConditions: []applyconfigv1.ClusterOperatorStatusConditionApplyConfiguration{
 				{
-					Type:    configv1.RetrievedUpdates,
-					Status:  configv1.ConditionTrue,
-					Message: "test",
+					Type:    ptr.To(configv1.RetrievedUpdates),
+					Status:  ptr.To(configv1.ConditionTrue),
+					Message: ptr.To("test"),
 				},
 			},
 			expectedMessages: []string{"RetrievedUpdates was removed"},
 		},
 	}
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
-			result := GetStatusDiff(configv1.ClusterOperatorStatus{Conditions: test.oldConditions}, configv1.ClusterOperatorStatus{Conditions: test.newConditions})
+			result := GetStatusDiff(
+				&applyconfigv1.ClusterOperatorStatusApplyConfiguration{Conditions: test.oldConditions},
+				&applyconfigv1.ClusterOperatorStatusApplyConfiguration{Conditions: test.newConditions})
 			if !reflect.DeepEqual(test.expectedMessages, strings.Split(result, ",")) {
 				t.Errorf("expected %#v, got %#v", test.expectedMessages, result)
 			}

pkg/operator/apiserver/controllerset/apiservercontrollerset.go

@@ -3,6 +3,7 @@ package apiservercontrollerset
 import (
 	"context"
 	"fmt"
+	"k8s.io/utils/clock"
 	"regexp"
 	"time"
 
@@ -74,6 +75,7 @@ type APIServerControllerSet struct {
 	name           string
 	operatorClient v1helpers.OperatorClient
 	eventRecorder  events.Recorder
+	clock          clock.PassiveClock
 
 	apiServiceController            controllerWrapper
 	auditPolicyController           controllerWrapper
@@ -92,11 +94,13 @@ func NewAPIServerControllerSet(
 	name string,
 	operatorClient v1helpers.OperatorClient,
 	eventRecorder events.Recorder,
+	clock clock.PassiveClock,
 ) *APIServerControllerSet {
 	apiServerControllerSet := &APIServerControllerSet{
 		name:           name,
 		operatorClient: operatorClient,
 		eventRecorder:  eventRecorder,
+		clock:          clock,
 	}
 
 	return apiServerControllerSet
@@ -143,6 +147,7 @@ func (cs *APIServerControllerSet) WithClusterOperatorStatusController(
 		cs.operatorClient,
 		versionRecorder,
 		cs.eventRecorder,
+		cs.clock,
 	)
 	for _, opt := range options {
 		s = opt(s)

pkg/operator/status/condition.go

@@ -2,6 +2,8 @@ package status
 
 import (
 	"fmt"
+	applyconfigv1 "github.com/openshift/client-go/config/applyconfigurations/config/v1"
+	"k8s.io/utils/ptr"
 	"sort"
 	"strings"
 	"time"
@@ -89,18 +91,18 @@ func UnionCondition(conditionType string, defaultConditionStatus operatorv1.Cond
 // on true, but Available merges on false.  Thing of it like an anti-default.
 //
 // If inertia is non-nil, then resist returning a condition with a status opposite the defaultConditionStatus.
-func UnionClusterCondition(conditionType configv1.ClusterStatusConditionType, defaultConditionStatus operatorv1.ConditionStatus, inertia Inertia, allConditions ...operatorv1.OperatorCondition) configv1.ClusterOperatorStatusCondition {
+func UnionClusterCondition(conditionType configv1.ClusterStatusConditionType, defaultConditionStatus operatorv1.ConditionStatus, inertia Inertia, allConditions ...operatorv1.OperatorCondition) *applyconfigv1.ClusterOperatorStatusConditionApplyConfiguration {
 	cnd := UnionCondition(string(conditionType), defaultConditionStatus, inertia, allConditions...)
 	return OperatorConditionToClusterOperatorCondition(cnd)
 }
 
-func OperatorConditionToClusterOperatorCondition(condition operatorv1.OperatorCondition) configv1.ClusterOperatorStatusCondition {
-	return configv1.ClusterOperatorStatusCondition{
-		Type:               configv1.ClusterStatusConditionType(condition.Type),
-		Status:             configv1.ConditionStatus(condition.Status),
-		LastTransitionTime: condition.LastTransitionTime,
-		Reason:             condition.Reason,
-		Message:            condition.Message,
+func OperatorConditionToClusterOperatorCondition(condition operatorv1.OperatorCondition) *applyconfigv1.ClusterOperatorStatusConditionApplyConfiguration {
+	return &applyconfigv1.ClusterOperatorStatusConditionApplyConfiguration{
+		Type:               ptr.To(configv1.ClusterStatusConditionType(condition.Type)),
+		Status:             ptr.To(configv1.ConditionStatus(condition.Status)),
+		LastTransitionTime: ptr.To(condition.LastTransitionTime),
+		Reason:             ptr.To(condition.Reason),
+		Message:            ptr.To(condition.Message),
 	}
 }
 func latestTransitionTime(conditions []operatorv1.OperatorCondition) metav1.Time {