Skip to content

pkg/cvo/internal/operatorstatus: Change nested message #514

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 1 commit into from
Mar 17, 2021
Merged

pkg/cvo/internal/operatorstatus: Change nested message #514

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pkg/cvo/internal/operatorstatus.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,9 +249,9 @@ func waitForOperatorStatusToBeDone(ctx context.Context, interval time.Duration,
}

lastErr = &payload.UpdateError{
Nested: nestedMessage,
Nested: fmt.Errorf("cluster operator is available and not degraded but has not finished updating to target version"),
UpdateEffect: payload.UpdateEffectNone,
Reason: "ClusterOperatorNotAvailable",
Reason: "ClusterOperatorUpdating",
Message: fmt.Sprintf("Cluster operator %s is updating versions", actual.Name),
Name: actual.Name,
}
Expand Down
8 changes: 4 additions & 4 deletions pkg/cvo/internal/operatorstatus_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,9 +354,9 @@ func Test_waitForOperatorStatusToBeDone(t *testing.T) {
},
},
expErr: &payload.UpdateError{
Nested: fmt.Errorf("cluster operator test-co conditions: available=true, progressing=true, degraded=true"),
Nested: fmt.Errorf("cluster operator is available and not degraded but has not finished updating to target version"),
UpdateEffect: payload.UpdateEffectNone,
Reason: "ClusterOperatorNotAvailable",
Reason: "ClusterOperatorUpdating",
Message: "Cluster operator test-co is updating versions",
Name: "test-co",
},
Expand Down Expand Up @@ -444,9 +444,9 @@ func Test_waitForOperatorStatusToBeDone(t *testing.T) {
},
},
expErr: &payload.UpdateError{
Nested: fmt.Errorf("cluster operator test-co conditions: available=true, progressing=true, degraded=true"),
Nested: fmt.Errorf("cluster operator is available and not degraded but has not finished updating to target version"),
UpdateEffect: payload.UpdateEffectNone,
Reason: "ClusterOperatorNotAvailable",
Reason: "ClusterOperatorUpdating",
Message: "Cluster operator test-co is updating versions",
Name: "test-co",
},
Expand Down