diff --git a/pkg/cvo/reconciliation_issues.go b/pkg/cvo/reconciliation_issues.go index 8c43ea065..124856c1b 100644 --- a/pkg/cvo/reconciliation_issues.go +++ b/pkg/cvo/reconciliation_issues.go @@ -10,10 +10,6 @@ import ( "github.com/openshift/cluster-version-operator/pkg/payload" ) -const ( - reconciliationIssuesConditionType configv1.ClusterStatusConditionType = "ReconciliationIssues" -) - // errorWalkCallback processes an error. It returns an error to fail the walk. type errorWalkCallback func(err error, depth int) error diff --git a/pkg/cvo/status.go b/pkg/cvo/status.go index c97608426..fb9e0cff7 100644 --- a/pkg/cvo/status.go +++ b/pkg/cvo/status.go @@ -411,12 +411,6 @@ func updateClusterVersionStatus(cvStatus *configv1.ClusterVersionStatus, status } } - // Pre-GA 4.20 TechPreview clusters may have this condition and we need to remove it if it exists when updated to this version - // TODO: Remove this code in 4.21 - if oldRiCondition := resourcemerge.FindOperatorStatusCondition(cvStatus.Conditions, reconciliationIssuesConditionType); oldRiCondition != nil { - resourcemerge.RemoveOperatorStatusCondition(&cvStatus.Conditions, reconciliationIssuesConditionType) - } - // default retrieved updates if it is not set if resourcemerge.FindOperatorStatusCondition(cvStatus.Conditions, configv1.RetrievedUpdates) == nil { resourcemerge.SetOperatorStatusCondition(&cvStatus.Conditions, configv1.ClusterOperatorStatusCondition{ diff --git a/pkg/cvo/status_test.go b/pkg/cvo/status_test.go index 8f720d2c1..2afb1f601 100644 --- a/pkg/cvo/status_test.go +++ b/pkg/cvo/status_test.go @@ -217,65 +217,6 @@ func (f fakeRiFlags) CVOConfiguration() bool { return f.cvoConfiguration } -// TODO: Can be removed in 4.21 -func TestUpdateClusterVersionStatus_AlwaysRemove_ReconciliationIssues(t *testing.T) { - testCases := []struct { - name string - - unknownVersion bool - oldCondition *configv1.ClusterOperatorStatusCondition - failure error - }{ - { - name: "version known, no failure => condition not present", - unknownVersion: false, - }, - { - name: "version known, failure => condition not present", - unknownVersion: false, - failure: fmt.Errorf("something happened"), - }, - { - name: "version unknown, failure, existing condition => condition present", - oldCondition: &configv1.ClusterOperatorStatusCondition{ - Type: reconciliationIssuesConditionType, - Status: configv1.ConditionFalse, - Reason: "noReconciliationIssuesReason", - Message: "Happy condition is happy", - }, - unknownVersion: true, - failure: fmt.Errorf("something happened"), - }, - { - name: "version unknown, failure, no existing condition => condition not present", - unknownVersion: true, - failure: fmt.Errorf("something happened"), - }, - } - for _, tc := range testCases { - tc := tc - t.Run(tc.name, func(t *testing.T) { - gates := fakeRiFlags{ - unknownVersion: tc.unknownVersion, - } - release := configv1.Release{} - getAvailableUpdates := func() *availableUpdates { return nil } - var noErrors field.ErrorList - cvStatus := configv1.ClusterVersionStatus{} - if tc.oldCondition != nil { - cvStatus.Conditions = append(cvStatus.Conditions, *tc.oldCondition) - } - updateClusterVersionStatus(&cvStatus, &SyncWorkerStatus{Failure: tc.failure}, release, getAvailableUpdates, gates, noErrors) - condition := resourcemerge.FindOperatorStatusCondition(cvStatus.Conditions, reconciliationIssuesConditionType) - if condition != nil { - t.Errorf("expected condition %s to not be present, but it was: %v", reconciliationIssuesConditionType, condition) - } - }) - - } - -} - func TestUpdateClusterVersionStatus_FilteringMultipleErrorsForFailingCondition(t *testing.T) { ignoreLastTransitionTime := cmpopts.IgnoreFields(configv1.ClusterOperatorStatusCondition{}, "LastTransitionTime") type args struct {