Skip to content

Commit 48d0c1c

Browse files
committed
NO-JIRA: Fix ImplicitlyEnabledCapabilities
1 parent 6fe4a71 commit 48d0c1c

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

pkg/cvo/status.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ const DesiredReleaseAccepted configv1.ClusterStatusConditionType = "ReleaseAccep
172172
// requesting via spec.capabilities, because the cluster version operator does not support uninstalling
173173
// capabilities if any associated resources were previously managed by the CVO or disabling previously
174174
// enabled capabilities.
175-
const ImplicitlyEnabledCapabilities configv1.ClusterStatusConditionType = "ImplicitlyEnabled"
175+
const ImplicitlyEnabledCapabilities configv1.ClusterStatusConditionType = "ImplicitlyEnabledCapabilities"
176176

177177
// syncStatus calculates the new status of the ClusterVersion based on the current sync state and any
178178
// validation errors found. We allow the caller to pass the original object to avoid DeepCopying twice.

pkg/cvo/status_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ func TestOperator_syncFailingStatus(t *testing.T) {
115115
{Type: ClusterStatusFailing, Status: configv1.ConditionTrue, Reason: "UpdatePayloadIntegrity", Message: "unable to apply object"},
116116
{Type: configv1.OperatorProgressing, Status: configv1.ConditionTrue, Message: "Working towards 4.0.1"},
117117
{Type: configv1.RetrievedUpdates, Status: configv1.ConditionFalse},
118-
{Type: ImplicitlyEnabledCapabilities, Status: "False", Reason: "AsExpected", Message: "Capabilities match configured spec"},
118+
{Type: "ImplicitlyEnabledCapabilities", Status: "False", Reason: "AsExpected", Message: "Capabilities match configured spec"},
119119
},
120120
},
121121
},
@@ -156,7 +156,7 @@ func TestOperator_syncFailingStatus(t *testing.T) {
156156
{Type: ClusterStatusFailing, Status: configv1.ConditionTrue, Reason: "", Message: "bad"},
157157
{Type: configv1.OperatorProgressing, Status: configv1.ConditionTrue, Reason: "", Message: "Error ensuring the cluster version is up to date: bad"},
158158
{Type: configv1.RetrievedUpdates, Status: configv1.ConditionFalse},
159-
{Type: ImplicitlyEnabledCapabilities, Status: "False", Reason: "AsExpected", Message: "Capabilities match configured spec"},
159+
{Type: "ImplicitlyEnabledCapabilities", Status: "False", Reason: "AsExpected", Message: "Capabilities match configured spec"},
160160
},
161161
},
162162
})

0 commit comments

Comments
 (0)