Merge pull request #1191 from hongkailiu/fix-ImplicitlyEnabledCapabilities

OCPBUGS-56114: Fix ImplicitlyEnabledCapabilities

Author: openshift-merge-bot[bot]

pkg/cvo/status.go

@@ -172,7 +172,7 @@ const DesiredReleaseAccepted configv1.ClusterStatusConditionType = "ReleaseAccep
 // 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 = "ImplicitlyEnabled"
+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.
@@ -488,6 +488,12 @@ func filterOutUpdateErrors(errs []error, updateEffect payload.UpdateEffectType)
 func setImplicitlyEnabledCapabilitiesCondition(cvStatus *configv1.ClusterVersionStatus, implicitlyEnabled []configv1.ClusterVersionCapability,
 	now metav1.Time) {
 
+	// This is to clean up the condition with type=ImplicitlyEnabled introduced by OCPBUGS-56114
+	if c := resourcemerge.FindOperatorStatusCondition(cvStatus.Conditions, "ImplicitlyEnabled"); c != nil {
+		klog.V(2).Infof("Remove the condition with type ImplicitlyEnabled")
+		resourcemerge.RemoveOperatorStatusCondition(&cvStatus.Conditions, "ImplicitlyEnabled")
+	}
+
 	if len(implicitlyEnabled) > 0 {
 		message := "The following capabilities could not be disabled: "
 		caps := make([]string, len(implicitlyEnabled))

pkg/cvo/status_test.go

@@ -115,7 +115,7 @@ func TestOperator_syncFailingStatus(t *testing.T) {
 								{Type: ClusterStatusFailing, Status: configv1.ConditionTrue, Reason: "UpdatePayloadIntegrity", Message: "unable to apply object"},
 								{Type: configv1.OperatorProgressing, Status: configv1.ConditionTrue, Message: "Working towards 4.0.1"},
 								{Type: configv1.RetrievedUpdates, Status: configv1.ConditionFalse},
-								{Type: ImplicitlyEnabledCapabilities, Status: "False", Reason: "AsExpected", Message: "Capabilities match configured spec"},
+								{Type: "ImplicitlyEnabledCapabilities", Status: "False", Reason: "AsExpected", Message: "Capabilities match configured spec"},
 							},
 						},
 					},
@@ -156,7 +156,7 @@ func TestOperator_syncFailingStatus(t *testing.T) {
 							{Type: ClusterStatusFailing, Status: configv1.ConditionTrue, Reason: "", Message: "bad"},
 							{Type: configv1.OperatorProgressing, Status: configv1.ConditionTrue, Reason: "", Message: "Error ensuring the cluster version is up to date: bad"},
 							{Type: configv1.RetrievedUpdates, Status: configv1.ConditionFalse},
-							{Type: ImplicitlyEnabledCapabilities, Status: "False", Reason: "AsExpected", Message: "Capabilities match configured spec"},
+							{Type: "ImplicitlyEnabledCapabilities", Status: "False", Reason: "AsExpected", Message: "Capabilities match configured spec"},
 						},
 					},
 				})
@@ -871,7 +871,11 @@ func TestUpdateClusterVersionStatus_FilteringMultipleErrorsForFailingCondition(t
 			}
 			for _, c := range combinations {
 				tc.args.syncWorkerStatus.Reconciling = c.isReconciling
-				cvStatus := &configv1.ClusterVersionStatus{}
+				cvStatus := &configv1.ClusterVersionStatus{
+					Conditions: []configv1.ClusterOperatorStatusCondition{
+						{Type: "ImplicitlyEnabled", Message: "to be removed"},
+					},
+				}
 				if !c.isHistoryEmpty {
 					cvStatus.History = []configv1.UpdateHistory{{State: configv1.PartialUpdate}}
 				}
@@ -891,6 +895,10 @@ func TestUpdateClusterVersionStatus_FilteringMultipleErrorsForFailingCondition(t
 						t.Errorf("unexpected progressingCondition when Reconciling == %t && isHistoryEmpty == %t\n:%s", c.isReconciling, c.isHistoryEmpty, diff)
 					}
 				}
+				conditionRemoved := resourcemerge.FindOperatorStatusCondition(cvStatus.Conditions, "ImplicitlyEnabled")
+				if conditionRemoved != nil {
+					t.Errorf("ImplicitlyEnabled condition should be removed but is still there when Reconciling == %t && isHistoryEmpty == %t", c.isReconciling, c.isHistoryEmpty)
+				}
 			}
 			payload.COUpdateStartTimesRemove("machine-config")
 		})