Merge pull request #1252 from hongkailiu/ClusterStatusConditionType

NO-JIRA: Move constants of ClusterStatusConditionType into one place

Author: openshift-merge-bot[bot]

pkg/cvo/cvo_scenarios_test.go

@@ -518,7 +518,7 @@ func (m *operatorMetrics) Collect(ch chan<- prometheus.Metric) {
 		}
 
 		// answers "if we are failing, are we updating or reconciling"
-		failing := resourcemerge.FindOperatorStatusCondition(cv.Status.Conditions, ClusterStatusFailing)
+		failing := resourcemerge.FindOperatorStatusCondition(cv.Status.Conditions, internal.ClusterStatusFailing)
 		if failing != nil && failing.Status == configv1.ConditionTrue {
 			if update := cv.Spec.DesiredUpdate; update != nil && update.Image != current.Image {
 				g = m.version.WithLabelValues("failure", update.Version, update.Image, completed.Version)

pkg/cvo/cvo_test.go

@@ -22,6 +22,8 @@ import (
 	"k8s.io/client-go/tools/record"
 
 	configv1 "github.com/openshift/api/config/v1"
+
+	"github.com/openshift/cluster-version-operator/pkg/internal"
 )
 
 func Test_operatorMetrics_Collect(t *testing.T) {
@@ -329,8 +331,8 @@ func Test_operatorMetrics_Collect(t *testing.T) {
 							Status: configv1.ClusterOperatorStatus{
 								Conditions: []configv1.ClusterOperatorStatusCondition{
 									{Type: configv1.OperatorAvailable, Status: configv1.ConditionTrue},
-									{Type: configv1.ClusterStatusConditionType("Custom"), Status: configv1.ConditionFalse, Reason: "CustomReason"},
-									{Type: configv1.ClusterStatusConditionType("Unknown"), Status: configv1.ConditionUnknown},
+									{Type: "Custom", Status: configv1.ConditionFalse, Reason: "CustomReason"},
+									{Type: "Unknown", Status: configv1.ConditionUnknown},
 								},
 							},
 						},
@@ -479,7 +481,7 @@ func Test_operatorMetrics_Collect(t *testing.T) {
 									{State: configv1.CompletedUpdate, Version: "0.0.2", Image: "test/image:1", CompletionTime: &([]metav1.Time{{Time: time.Unix(2, 0)}}[0])},
 								},
 								Conditions: []configv1.ClusterOperatorStatusCondition{
-									{Type: ClusterStatusFailing, Status: configv1.ConditionTrue, LastTransitionTime: metav1.Time{Time: time.Unix(4, 0)}, Reason: "Because stuff"},
+									{Type: internal.ClusterStatusFailing, Status: configv1.ConditionTrue, LastTransitionTime: metav1.Time{Time: time.Unix(4, 0)}, Reason: "Because stuff"},
 								},
 							},
 						},
@@ -517,7 +519,7 @@ func Test_operatorMetrics_Collect(t *testing.T) {
 							},
 							Status: configv1.ClusterVersionStatus{
 								Conditions: []configv1.ClusterOperatorStatusCondition{
-									{Type: ClusterStatusFailing, Status: configv1.ConditionTrue, Reason: "Because stuff"},
+									{Type: internal.ClusterStatusFailing, Status: configv1.ConditionTrue, Reason: "Because stuff"},
 								},
 							},
 						},
@@ -717,7 +719,7 @@ func Test_operatorMetrics_CollectTransitions(t *testing.T) {
 					Status: configv1.ClusterOperatorStatus{
 						Conditions: []configv1.ClusterOperatorStatusCondition{
 							{Type: configv1.OperatorAvailable, Status: configv1.ConditionTrue},
-							{Type: configv1.ClusterStatusConditionType("Custom"), Status: configv1.ConditionFalse},
+							{Type: "Custom", Status: configv1.ConditionFalse},
 						},
 					},
 				},
@@ -726,17 +728,17 @@ func Test_operatorMetrics_CollectTransitions(t *testing.T) {
 					Status: configv1.ClusterOperatorStatus{
 						Conditions: []configv1.ClusterOperatorStatusCondition{
 							{Type: configv1.OperatorAvailable, Status: configv1.ConditionFalse},
-							{Type: configv1.ClusterStatusConditionType("Custom"), Status: configv1.ConditionFalse},
-							{Type: configv1.ClusterStatusConditionType("Unknown"), Status: configv1.ConditionUnknown},
+							{Type: "Custom", Status: configv1.ConditionFalse},
+							{Type: "Unknown", Status: configv1.ConditionUnknown},
 						},
 					},
 				},
 				&configv1.ClusterOperator{
 					ObjectMeta: metav1.ObjectMeta{Name: "test"},
 					Status: configv1.ClusterOperatorStatus{
 						Conditions: []configv1.ClusterOperatorStatusCondition{
-							{Type: configv1.ClusterStatusConditionType("Custom"), Status: configv1.ConditionTrue},
-							{Type: configv1.ClusterStatusConditionType("Unknown"), Status: configv1.ConditionTrue},
+							{Type: "Custom", Status: configv1.ConditionTrue},
+							{Type: "Unknown", Status: configv1.ConditionTrue},
 						},
 					},
 				},

pkg/cvo/metrics.go

@@ -24,15 +24,11 @@ import (
 
 	"github.com/openshift/cluster-version-operator/lib/resourcemerge"
 	"github.com/openshift/cluster-version-operator/pkg/featuregates"
+	"github.com/openshift/cluster-version-operator/pkg/internal"
 	"github.com/openshift/cluster-version-operator/pkg/payload"
 )
 
 const (
-	// ClusterStatusFailing is set on the ClusterVersion status when a cluster
-	// cannot reach the desired state. It is considered more serious than Degraded
-	// and indicates the cluster is not healthy.
-	ClusterStatusFailing = configv1.ClusterStatusConditionType("Failing")
-
 	// ConditionalUpdateConditionTypeRecommended is a type of the condition present on a conditional update
 	// that indicates whether the conditional update is recommended or not
 	ConditionalUpdateConditionTypeRecommended = "Recommended"
@@ -159,21 +155,6 @@ func mergeOperatorHistory(cvStatus *configv1.ClusterVersionStatus, desired confi
 	cvStatus.Desired = desired
 }
 
-// ClusterVersionInvalid indicates that the cluster version has an error that prevents the server from
-// taking action. The cluster version operator will only reconcile the current state as long as this
-// condition is set.
-const ClusterVersionInvalid configv1.ClusterStatusConditionType = "Invalid"
-
-// DesiredReleaseAccepted indicates whether the requested (desired) release payload was successfully loaded
-// and no failures occurred during image verification and precondition checking.
-const DesiredReleaseAccepted configv1.ClusterStatusConditionType = "ReleaseAccepted"
-
-// ImplicitlyEnabledCapabilities is True if there are enabled capabilities which the user is not currently
-// requesting via spec.capabilities, because the cluster version operator does not support uninstalling
-// capabilities if any associated resources were previously managed by the CVO or disabling previously
-// enabled capabilities.
-const ImplicitlyEnabledCapabilities configv1.ClusterStatusConditionType = "ImplicitlyEnabledCapabilities"
-
 // syncStatus calculates the new status of the ClusterVersion based on the current sync state and any
 // validation errors found. We allow the caller to pass the original object to avoid DeepCopying twice.
 func (optr *Operator) syncStatus(ctx context.Context, original, config *configv1.ClusterVersion, status *SyncWorkerStatus, validationErrs field.ErrorList) error {
@@ -265,21 +246,21 @@ func updateClusterVersionStatus(cvStatus *configv1.ClusterVersionStatus, status
 		reason = "InvalidClusterVersion"
 
 		resourcemerge.SetOperatorStatusCondition(&cvStatus.Conditions, configv1.ClusterOperatorStatusCondition{
-			Type:               ClusterVersionInvalid,
+			Type:               internal.ClusterVersionInvalid,
 			Status:             configv1.ConditionTrue,
 			Reason:             reason,
 			Message:            buf.String(),
 			LastTransitionTime: now,
 		})
 	} else {
-		resourcemerge.RemoveOperatorStatusCondition(&cvStatus.Conditions, ClusterVersionInvalid)
+		resourcemerge.RemoveOperatorStatusCondition(&cvStatus.Conditions, internal.ClusterVersionInvalid)
 	}
 
 	// set the implicitly enabled capabilities condition
 	setImplicitlyEnabledCapabilitiesCondition(cvStatus, status.CapabilitiesStatus.ImplicitlyEnabledCaps, now)
 
-	// set the desired release accepted condition
-	setDesiredReleaseAcceptedCondition(cvStatus, status.loadPayloadStatus, now)
+	// set the release accepted condition
+	setReleaseAcceptedCondition(cvStatus, status.loadPayloadStatus, now)
 
 	// set the available condition
 	if status.Completed > 0 {
@@ -318,7 +299,7 @@ func updateClusterVersionStatus(cvStatus *configv1.ClusterVersionStatus, status
 
 	// set the failing condition
 	failingCondition := configv1.ClusterOperatorStatusCondition{
-		Type:               ClusterStatusFailing,
+		Type:               internal.ClusterStatusFailing,
 		Status:             configv1.ConditionFalse,
 		LastTransitionTime: now,
 	}
@@ -482,15 +463,15 @@ func setImplicitlyEnabledCapabilitiesCondition(cvStatus *configv1.ClusterVersion
 		message = message + strings.Join([]string(caps), ", ")
 
 		resourcemerge.SetOperatorStatusCondition(&cvStatus.Conditions, configv1.ClusterOperatorStatusCondition{
-			Type:               ImplicitlyEnabledCapabilities,
+			Type:               internal.ImplicitlyEnabledCapabilities,
 			Status:             configv1.ConditionTrue,
 			Reason:             "CapabilitiesImplicitlyEnabled",
 			Message:            message,
 			LastTransitionTime: now,
 		})
 	} else {
 		resourcemerge.SetOperatorStatusCondition(&cvStatus.Conditions, configv1.ClusterOperatorStatusCondition{
-			Type:               ImplicitlyEnabledCapabilities,
+			Type:               internal.ImplicitlyEnabledCapabilities,
 			Status:             configv1.ConditionFalse,
 			Reason:             "AsExpected",
 			Message:            "Capabilities match configured spec",
@@ -499,10 +480,10 @@ func setImplicitlyEnabledCapabilitiesCondition(cvStatus *configv1.ClusterVersion
 	}
 }
 
-func setDesiredReleaseAcceptedCondition(cvStatus *configv1.ClusterVersionStatus, status LoadPayloadStatus, now metav1.Time) {
+func setReleaseAcceptedCondition(cvStatus *configv1.ClusterVersionStatus, status LoadPayloadStatus, now metav1.Time) {
 	if status.Step == "PayloadLoaded" {
 		resourcemerge.SetOperatorStatusCondition(&cvStatus.Conditions, configv1.ClusterOperatorStatusCondition{
-			Type:               DesiredReleaseAccepted,
+			Type:               internal.ReleaseAccepted,
 			Status:             configv1.ConditionTrue,
 			Reason:             status.Step,
 			Message:            status.Message,
@@ -511,15 +492,15 @@ func setDesiredReleaseAcceptedCondition(cvStatus *configv1.ClusterVersionStatus,
 	} else if status.Step != "" {
 		if status.Failure != nil {
 			resourcemerge.SetOperatorStatusCondition(&cvStatus.Conditions, configv1.ClusterOperatorStatusCondition{
-				Type:               DesiredReleaseAccepted,
+				Type:               internal.ReleaseAccepted,
 				Status:             configv1.ConditionFalse,
 				Reason:             status.Step,
 				Message:            status.Message,
 				LastTransitionTime: now,
 			})
 		} else {
 			resourcemerge.SetOperatorStatusCondition(&cvStatus.Conditions, configv1.ClusterOperatorStatusCondition{
-				Type:               DesiredReleaseAccepted,
+				Type:               internal.ReleaseAccepted,
 				Status:             configv1.ConditionUnknown,
 				Reason:             status.Step,
 				Message:            status.Message,
@@ -644,7 +625,7 @@ func (optr *Operator) syncFailingStatus(ctx context.Context, original *configv1.
 
 	// reset the failing message
 	resourcemerge.SetOperatorStatusCondition(&config.Status.Conditions, configv1.ClusterOperatorStatusCondition{
-		Type:               ClusterStatusFailing,
+		Type:               internal.ClusterStatusFailing,
 		Status:             configv1.ConditionTrue,
 		Message:            ierr.Error(),
 		LastTransitionTime: now,