From ce1eda109526a5b2fe03775a19f2bc2d86c24af2 Mon Sep 17 00:00:00 2001 From: Jack Ottofaro Date: Thu, 4 Feb 2021 11:05:45 -0500 Subject: [PATCH] pkg/cvo/internal/operatorstatus: Change nested message --- pkg/cvo/internal/operatorstatus.go | 4 ++-- pkg/cvo/internal/operatorstatus_test.go | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkg/cvo/internal/operatorstatus.go b/pkg/cvo/internal/operatorstatus.go index 004c76c20..299fcc4cc 100644 --- a/pkg/cvo/internal/operatorstatus.go +++ b/pkg/cvo/internal/operatorstatus.go @@ -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, } diff --git a/pkg/cvo/internal/operatorstatus_test.go b/pkg/cvo/internal/operatorstatus_test.go index aeefe6776..97fa5bc98 100644 --- a/pkg/cvo/internal/operatorstatus_test.go +++ b/pkg/cvo/internal/operatorstatus_test.go @@ -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", }, @@ -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", },