Skip to content

Commit 76f0dd4

Browse files
hongkailiuhongkailiu
committed
Rename DesiredReleaseAccepted to ReleaseAccepted
1 parent bfc7f69 commit 76f0dd4

5 files changed

Lines changed: 28 additions & 28 deletions

File tree

‎pkg/cvo/cvo_scenarios_test.go‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ func TestCVO_StartupAndSync(t *testing.T) {
240240
{Type: internal.ClusterStatusFailing, Status: configv1.ConditionFalse},
241241
{Type: configv1.OperatorProgressing, Status: configv1.ConditionTrue, Message: "Working towards 1.0.0-abc"},
242242
{Type: configv1.RetrievedUpdates, Status: configv1.ConditionFalse},
243-
{Type: internal.DesiredReleaseAccepted, Status: configv1.ConditionTrue, Reason: "PayloadLoaded",
243+
{Type: internal.ReleaseAccepted, Status: configv1.ConditionTrue, Reason: "PayloadLoaded",
244244
Message: "Payload loaded version=\"1.0.0-abc\" image=\"image/image:1\" architecture=\"" + architecture + "\""},
245245
},
246246
},
@@ -420,7 +420,7 @@ func TestCVO_StartupAndSync(t *testing.T) {
420420
{Type: internal.ClusterStatusFailing, Status: configv1.ConditionFalse},
421421
{Type: configv1.OperatorProgressing, Status: configv1.ConditionFalse, Message: "Cluster version is 1.0.0-abc"},
422422
{Type: configv1.RetrievedUpdates, Status: configv1.ConditionFalse},
423-
{Type: internal.DesiredReleaseAccepted, Status: configv1.ConditionTrue, Reason: "PayloadLoaded",
423+
{Type: internal.ReleaseAccepted, Status: configv1.ConditionTrue, Reason: "PayloadLoaded",
424424
Message: "Payload loaded version=\"1.0.0-abc\" image=\"image/image:1\" architecture=\"" + architecture + "\""},
425425
},
426426
},
@@ -657,7 +657,7 @@ func TestCVO_StartupAndSyncUnverifiedPayload(t *testing.T) {
657657
{Type: internal.ClusterStatusFailing, Status: configv1.ConditionFalse},
658658
{Type: configv1.OperatorProgressing, Status: configv1.ConditionTrue, Message: "Working towards 1.0.0-abc"},
659659
{Type: configv1.RetrievedUpdates, Status: configv1.ConditionFalse},
660-
{Type: internal.DesiredReleaseAccepted, Status: configv1.ConditionTrue, Reason: "PayloadLoaded",
660+
{Type: internal.ReleaseAccepted, Status: configv1.ConditionTrue, Reason: "PayloadLoaded",
661661
Message: "Payload loaded version=\"1.0.0-abc\" image=\"image/image:1\" architecture=\"" + architecture + "\""},
662662
},
663663
},
@@ -826,7 +826,7 @@ func TestCVO_StartupAndSyncUnverifiedPayload(t *testing.T) {
826826
{Type: internal.ClusterStatusFailing, Status: configv1.ConditionFalse},
827827
{Type: configv1.OperatorProgressing, Status: configv1.ConditionFalse, Message: "Cluster version is 1.0.0-abc"},
828828
{Type: configv1.RetrievedUpdates, Status: configv1.ConditionFalse},
829-
{Type: internal.DesiredReleaseAccepted, Status: configv1.ConditionTrue, Reason: "PayloadLoaded",
829+
{Type: internal.ReleaseAccepted, Status: configv1.ConditionTrue, Reason: "PayloadLoaded",
830830
Message: "Payload loaded version=\"1.0.0-abc\" image=\"image/image:1\" architecture=\"" + architecture + "\""},
831831
},
832832
},
@@ -1061,7 +1061,7 @@ func TestCVO_StartupAndSyncPreconditionFailing(t *testing.T) {
10611061
{Type: internal.ClusterStatusFailing, Status: configv1.ConditionFalse},
10621062
{Type: configv1.OperatorProgressing, Status: configv1.ConditionTrue, Message: "Working towards 1.0.0-abc"},
10631063
{Type: configv1.RetrievedUpdates, Status: configv1.ConditionFalse},
1064-
{Type: internal.DesiredReleaseAccepted, Status: configv1.ConditionTrue, Reason: "PayloadLoaded",
1064+
{Type: internal.ReleaseAccepted, Status: configv1.ConditionTrue, Reason: "PayloadLoaded",
10651065
Message: "Payload loaded version=\"1.0.0-abc\" image=\"image/image:1\" architecture=\"" + architecture + "\""},
10661066
},
10671067
},
@@ -1225,7 +1225,7 @@ func TestCVO_StartupAndSyncPreconditionFailing(t *testing.T) {
12251225
{Type: internal.ClusterStatusFailing, Status: configv1.ConditionFalse},
12261226
{Type: configv1.OperatorProgressing, Status: configv1.ConditionFalse, Message: "Cluster version is 1.0.0-abc"},
12271227
{Type: configv1.RetrievedUpdates, Status: configv1.ConditionFalse},
1228-
{Type: internal.DesiredReleaseAccepted, Status: configv1.ConditionTrue, Reason: "PayloadLoaded",
1228+
{Type: internal.ReleaseAccepted, Status: configv1.ConditionTrue, Reason: "PayloadLoaded",
12291229
Message: "Payload loaded version=\"1.0.0-abc\" image=\"image/image:1\" architecture=\"" + architecture + "\""},
12301230
},
12311231
},
@@ -1471,7 +1471,7 @@ func TestCVO_UpgradeUnverifiedPayload(t *testing.T) {
14711471
},
14721472
Conditions: []configv1.ClusterOperatorStatusCondition{
14731473
{Type: internal.ImplicitlyEnabledCapabilities, Status: "False", Reason: "AsExpected", Message: "Capabilities match configured spec"},
1474-
{Type: internal.DesiredReleaseAccepted, Status: configv1.ConditionFalse, Reason: "RetrievePayload",
1474+
{Type: internal.ReleaseAccepted, Status: configv1.ConditionFalse, Reason: "RetrievePayload",
14751475
Message: "Retrieving payload failed version=\"1.0.1-abc\" image=\"image/image:1\" failure=The update cannot be verified: some random error"},
14761476
{Type: "Available", Status: "False"},
14771477
{Type: "Failing", Status: "False"},
@@ -1602,7 +1602,7 @@ func TestCVO_UpgradeUnverifiedPayload(t *testing.T) {
16021602
},
16031603
Conditions: []configv1.ClusterOperatorStatusCondition{
16041604
{Type: internal.ImplicitlyEnabledCapabilities, Status: "False", Reason: "AsExpected", Message: "Capabilities match configured spec"},
1605-
{Type: internal.DesiredReleaseAccepted, Status: configv1.ConditionTrue, Reason: "PayloadLoaded",
1605+
{Type: internal.ReleaseAccepted, Status: configv1.ConditionTrue, Reason: "PayloadLoaded",
16061606
Message: "Payload loaded version=\"1.0.1-abc\" image=\"image/image:1\" architecture=\"" + architecture + "\""},
16071607
{Type: configv1.OperatorAvailable, Status: configv1.ConditionTrue, Message: "Done applying 1.0.1-abc"},
16081608
{Type: internal.ClusterStatusFailing, Status: configv1.ConditionFalse},
@@ -1730,7 +1730,7 @@ func TestCVO_ResetPayloadLoadStatus(t *testing.T) {
17301730
},
17311731
Conditions: []configv1.ClusterOperatorStatusCondition{
17321732
{Type: internal.ImplicitlyEnabledCapabilities, Status: "False", Reason: "AsExpected", Message: "Capabilities match configured spec"},
1733-
{Type: internal.DesiredReleaseAccepted, Status: configv1.ConditionFalse, Reason: "RetrievePayload",
1733+
{Type: internal.ReleaseAccepted, Status: configv1.ConditionFalse, Reason: "RetrievePayload",
17341734
Message: "Retrieving payload failed version=\"1.0.1-abc\" image=\"image/image:1\" failure=The update cannot be verified: some random error"},
17351735
{Type: "Available", Status: "False"},
17361736
{Type: "Failing", Status: "False"},
@@ -1849,7 +1849,7 @@ func TestCVO_ResetPayloadLoadStatus(t *testing.T) {
18491849
},
18501850
Conditions: []configv1.ClusterOperatorStatusCondition{
18511851
{Type: internal.ImplicitlyEnabledCapabilities, Status: "False", Reason: "AsExpected", Message: "Capabilities match configured spec"},
1852-
{Type: internal.DesiredReleaseAccepted, Status: configv1.ConditionTrue, Reason: "PayloadLoaded",
1852+
{Type: internal.ReleaseAccepted, Status: configv1.ConditionTrue, Reason: "PayloadLoaded",
18531853
Message: "Payload loaded version=\"1.0.0-abc\" image=\"image/image:0\""},
18541854
{Type: "Available", Status: "False"},
18551855
{Type: "Failing", Status: "False"},
@@ -2132,7 +2132,7 @@ func TestCVO_InitImplicitlyEnabledCaps(t *testing.T) {
21322132
},
21332133
Conditions: []configv1.ClusterOperatorStatusCondition{
21342134
{Type: internal.ImplicitlyEnabledCapabilities, Status: configv1.ConditionTrue, Reason: "CapabilitiesImplicitlyEnabled", Message: "The following capabilities could not be disabled: Build, CSISnapshot, CloudControllerManager, CloudCredential, Console, DeploymentConfig, ImageRegistry, Ingress, Insights, MachineAPI, NodeTuning, OperatorLifecycleManager, OperatorLifecycleManagerV1, Storage, marketplace, openshift-samples"},
2135-
{Type: internal.DesiredReleaseAccepted, Status: configv1.ConditionTrue, Reason: "PayloadLoaded",
2135+
{Type: internal.ReleaseAccepted, Status: configv1.ConditionTrue, Reason: "PayloadLoaded",
21362136
Message: "Payload loaded version=\"1.0.1-abc\" image=\"image/image:1\" architecture=\"" + architecture + "\""},
21372137
{Type: "Available", Status: "False"},
21382138
{Type: "Failing", Status: "False"},
@@ -2269,7 +2269,7 @@ func TestCVO_UpgradeUnverifiedPayloadRetrieveOnce(t *testing.T) {
22692269
{Type: internal.ClusterStatusFailing, Status: configv1.ConditionFalse},
22702270
{Type: configv1.OperatorProgressing, Status: configv1.ConditionTrue, Message: "Working towards 1.0.1-abc"},
22712271
{Type: configv1.RetrievedUpdates, Status: configv1.ConditionFalse},
2272-
{Type: internal.DesiredReleaseAccepted, Status: configv1.ConditionFalse, Reason: "RetrievePayload",
2272+
{Type: internal.ReleaseAccepted, Status: configv1.ConditionFalse, Reason: "RetrievePayload",
22732273
Message: "Retrieving payload failed version=\"1.0.1-abc\" image=\"image/image:1\" failure=The update cannot be verified: some random error"},
22742274
},
22752275
},
@@ -2401,7 +2401,7 @@ func TestCVO_UpgradeUnverifiedPayloadRetrieveOnce(t *testing.T) {
24012401
{Type: internal.ClusterStatusFailing, Status: configv1.ConditionFalse},
24022402
{Type: configv1.OperatorProgressing, Status: configv1.ConditionFalse, Message: "Cluster version is 1.0.1-abc"},
24032403
{Type: configv1.RetrievedUpdates, Status: configv1.ConditionFalse},
2404-
{Type: internal.DesiredReleaseAccepted, Status: configv1.ConditionTrue, Reason: "PayloadLoaded",
2404+
{Type: internal.ReleaseAccepted, Status: configv1.ConditionTrue, Reason: "PayloadLoaded",
24052405
Message: "Payload loaded version=\"1.0.1-abc\" image=\"image/image:1\" architecture=\"" + architecture + "\""},
24062406
},
24072407
},
@@ -2709,7 +2709,7 @@ func TestCVO_UpgradePreconditionFailing(t *testing.T) {
27092709
{Type: internal.ClusterStatusFailing, Status: configv1.ConditionFalse},
27102710
{Type: configv1.OperatorProgressing, Status: configv1.ConditionFalse, Message: "Cluster version is 1.0.1-abc"},
27112711
{Type: configv1.RetrievedUpdates, Status: configv1.ConditionFalse},
2712-
{Type: internal.DesiredReleaseAccepted, Status: configv1.ConditionTrue, Reason: "PayloadLoaded",
2712+
{Type: internal.ReleaseAccepted, Status: configv1.ConditionTrue, Reason: "PayloadLoaded",
27132713
Message: "Payload loaded version=\"1.0.1-abc\" image=\"image/image:1\" architecture=\"" + architecture + "\""},
27142714
},
27152715
},
@@ -2953,7 +2953,7 @@ func TestCVO_UpgradePayloadStillInitializing(t *testing.T) {
29532953
{Type: internal.ClusterStatusFailing, Status: configv1.ConditionFalse},
29542954
{Type: configv1.OperatorProgressing, Status: configv1.ConditionFalse, Message: "Cluster version is 1.0.0-abc"},
29552955
{Type: configv1.RetrievedUpdates, Status: configv1.ConditionFalse},
2956-
{Type: internal.DesiredReleaseAccepted, Status: configv1.ConditionTrue, Reason: "PayloadLoaded",
2956+
{Type: internal.ReleaseAccepted, Status: configv1.ConditionTrue, Reason: "PayloadLoaded",
29572957
Message: `Payload loaded version="1.0.0-abc" image="image/image:0" architecture="` + architecture + `"`},
29582958
},
29592959
},
@@ -3057,7 +3057,7 @@ func TestCVO_UpgradeVerifiedPayload(t *testing.T) {
30573057
// set progressing
30583058
{Type: configv1.OperatorProgressing, Status: configv1.ConditionTrue, Message: "Working towards 1.0.1-abc"},
30593059
{Type: configv1.RetrievedUpdates, Status: configv1.ConditionFalse},
3060-
{Type: internal.DesiredReleaseAccepted, Status: configv1.ConditionTrue, Reason: "PayloadLoaded",
3060+
{Type: internal.ReleaseAccepted, Status: configv1.ConditionTrue, Reason: "PayloadLoaded",
30613061
Message: "Payload loaded version=\"1.0.1-abc\" image=\"image/image:1\" architecture=\"" + architecture + "\""},
30623062
},
30633063
},
@@ -3645,7 +3645,7 @@ func TestCVO_ErrorDuringReconcile(t *testing.T) {
36453645
{Type: internal.ClusterStatusFailing, Status: configv1.ConditionTrue, Reason: "UpdatePayloadFailed", Message: "Could not update test \"file-yml\" (3 of 3)"},
36463646
{Type: configv1.OperatorProgressing, Status: configv1.ConditionFalse, Reason: "UpdatePayloadFailed", Message: "Error while reconciling 1.0.0-abc: the update could not be applied"},
36473647
{Type: configv1.RetrievedUpdates, Status: configv1.ConditionFalse},
3648-
{Type: internal.DesiredReleaseAccepted, Status: configv1.ConditionTrue, Reason: "PayloadLoaded",
3648+
{Type: internal.ReleaseAccepted, Status: configv1.ConditionTrue, Reason: "PayloadLoaded",
36493649
Message: "Payload loaded version=\"1.0.0-abc\" image=\"image/image:1\" architecture=\"" + architecture + "\""},
36503650
},
36513651
},
@@ -3849,7 +3849,7 @@ func TestCVO_ParallelError(t *testing.T) {
38493849
},
38503850
Conditions: []configv1.ClusterOperatorStatusCondition{
38513851
{Type: internal.ImplicitlyEnabledCapabilities, Status: "False", Reason: "AsExpected", Message: "Capabilities match configured spec"},
3852-
{Type: internal.DesiredReleaseAccepted, Status: configv1.ConditionTrue, Reason: "PayloadLoaded",
3852+
{Type: internal.ReleaseAccepted, Status: configv1.ConditionTrue, Reason: "PayloadLoaded",
38533853
Message: "Payload loaded version=\"1.0.0-abc\" image=\"image/image:1\" architecture=\"" + architecture + "\""},
38543854
{Type: configv1.OperatorAvailable, Status: configv1.ConditionFalse},
38553855
{Type: internal.ClusterStatusFailing, Status: configv1.ConditionTrue, Message: "Failed to reconcile 20-b-file resource"},

‎pkg/cvo/status.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -483,7 +483,7 @@ func setImplicitlyEnabledCapabilitiesCondition(cvStatus *configv1.ClusterVersion
483483
func setDesiredReleaseAcceptedCondition(cvStatus *configv1.ClusterVersionStatus, status LoadPayloadStatus, now metav1.Time) {
484484
if status.Step == "PayloadLoaded" {
485485
resourcemerge.SetOperatorStatusCondition(&cvStatus.Conditions, configv1.ClusterOperatorStatusCondition{
486-
Type: internal.DesiredReleaseAccepted,
486+
Type: internal.ReleaseAccepted,
487487
Status: configv1.ConditionTrue,
488488
Reason: status.Step,
489489
Message: status.Message,
@@ -492,15 +492,15 @@ func setDesiredReleaseAcceptedCondition(cvStatus *configv1.ClusterVersionStatus,
492492
} else if status.Step != "" {
493493
if status.Failure != nil {
494494
resourcemerge.SetOperatorStatusCondition(&cvStatus.Conditions, configv1.ClusterOperatorStatusCondition{
495-
Type: internal.DesiredReleaseAccepted,
495+
Type: internal.ReleaseAccepted,
496496
Status: configv1.ConditionFalse,
497497
Reason: status.Step,
498498
Message: status.Message,
499499
LastTransitionTime: now,
500500
})
501501
} else {
502502
resourcemerge.SetOperatorStatusCondition(&cvStatus.Conditions, configv1.ClusterOperatorStatusCondition{
503-
Type: internal.DesiredReleaseAccepted,
503+
Type: internal.ReleaseAccepted,
504504
Status: configv1.ConditionUnknown,
505505
Reason: status.Step,
506506
Message: status.Message,

‎pkg/cvo/upgradeable.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -530,7 +530,7 @@ func (optr *Operator) adminGatesEventHandler() cache.ResourceEventHandler {
530530
//
531531
// The cv parameter is expected to be non-nil.
532532
func (intervals *upgradeableCheckIntervals) throttlePeriod(cv *configv1.ClusterVersion) time.Duration {
533-
if cond := resourcemerge.FindOperatorStatusCondition(cv.Status.Conditions, internal.DesiredReleaseAccepted); cond != nil {
533+
if cond := resourcemerge.FindOperatorStatusCondition(cv.Status.Conditions, internal.ReleaseAccepted); cond != nil {
534534
deadline := cond.LastTransitionTime.Time.Add(intervals.afterPreconditionsFailed)
535535
if cond.Reason == "PreconditionChecks" && cond.Status == configv1.ConditionFalse && time.Now().Before(deadline) {
536536
return intervals.minOnFailedPreconditions

‎pkg/cvo/upgradeable_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,18 @@ func TestUpgradeableCheckIntervalsThrottlePeriod(t *testing.T) {
2525
},
2626
{
2727
name: "passing preconditions",
28-
condition: &configv1.ClusterOperatorStatusCondition{Type: internal.DesiredReleaseAccepted, Reason: "PreconditionChecks", Status: configv1.ConditionTrue, LastTransitionTime: metav1.Now()},
28+
condition: &configv1.ClusterOperatorStatusCondition{Type: internal.ReleaseAccepted, Reason: "PreconditionChecks", Status: configv1.ConditionTrue, LastTransitionTime: metav1.Now()},
2929
expected: intervals.min,
3030
},
3131
{
3232
name: "failing but not precondition",
33-
condition: &configv1.ClusterOperatorStatusCondition{Type: internal.DesiredReleaseAccepted, Reason: "NotPreconditionChecks", Status: configv1.ConditionFalse, LastTransitionTime: metav1.Now()},
33+
condition: &configv1.ClusterOperatorStatusCondition{Type: internal.ReleaseAccepted, Reason: "NotPreconditionChecks", Status: configv1.ConditionFalse, LastTransitionTime: metav1.Now()},
3434
expected: intervals.min,
3535
},
3636
{
3737
name: "failing preconditions but too long ago",
3838
condition: &configv1.ClusterOperatorStatusCondition{
39-
Type: internal.DesiredReleaseAccepted,
39+
Type: internal.ReleaseAccepted,
4040
Reason: "PreconditionChecks",
4141
Status: configv1.ConditionFalse,
4242
LastTransitionTime: metav1.NewTime(time.Now().Add(-(intervals.afterPreconditionsFailed + time.Hour))),
@@ -45,7 +45,7 @@ func TestUpgradeableCheckIntervalsThrottlePeriod(t *testing.T) {
4545
},
4646
{
4747
name: "failing preconditions recently",
48-
condition: &configv1.ClusterOperatorStatusCondition{Type: internal.DesiredReleaseAccepted, Reason: "PreconditionChecks", Status: configv1.ConditionFalse, LastTransitionTime: metav1.Now()},
48+
condition: &configv1.ClusterOperatorStatusCondition{Type: internal.ReleaseAccepted, Reason: "PreconditionChecks", Status: configv1.ConditionFalse, LastTransitionTime: metav1.Now()},
4949
expected: intervals.minOnFailedPreconditions,
5050
},
5151
}

‎pkg/internal/constants.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@ const (
4545
// condition is set.
4646
ClusterVersionInvalid configv1.ClusterStatusConditionType = "Invalid"
4747

48-
// DesiredReleaseAccepted indicates whether the requested (desired) release payload was successfully loaded
48+
// ReleaseAccepted indicates whether the requested (desired) release payload was successfully loaded
4949
// and no failures occurred during image verification and precondition checking.
50-
DesiredReleaseAccepted configv1.ClusterStatusConditionType = "ReleaseAccepted"
50+
ReleaseAccepted configv1.ClusterStatusConditionType = "ReleaseAccepted"
5151

5252
// ImplicitlyEnabledCapabilities is True if there are enabled capabilities which the user is not currently
5353
// requesting via spec.capabilities, because the cluster version operator does not support uninstalling

0 commit comments

Comments
 (0)