diff --git a/pkg/cli/admin/upgrade/recommend/examples/4.14.1-all-recommended.version-4.12.51-output b/pkg/cli/admin/upgrade/recommend/examples/4.14.1-all-recommended.version-4.12.51-output index ad6c4e022a..492debaf0d 100644 --- a/pkg/cli/admin/upgrade/recommend/examples/4.14.1-all-recommended.version-4.12.51-output +++ b/pkg/cli/admin/upgrade/recommend/examples/4.14.1-all-recommended.version-4.12.51-output @@ -10,5 +10,4 @@ recommended/Alert=Unknown: Upstream update service: https://api.integration.openshift.com/api/upgrades_info/graph Channel: candidate-4.14 (available channels: candidate-4.14, candidate-4.15, eus-4.14, fast-4.14, stable-4.14) - error: no updates to 4.12 available, so cannot display context for the requested release 4.12.51 diff --git a/pkg/cli/admin/upgrade/recommend/examples/4.22.0-extend-recommended-alert.version-1.2.3-not-important-output b/pkg/cli/admin/upgrade/recommend/examples/4.22.0-extend-recommended-alert.version-1.2.3-not-important-output index 0bfcaf6fe0..7080b5c823 100644 --- a/pkg/cli/admin/upgrade/recommend/examples/4.22.0-extend-recommended-alert.version-1.2.3-not-important-output +++ b/pkg/cli/admin/upgrade/recommend/examples/4.22.0-extend-recommended-alert.version-1.2.3-not-important-output @@ -17,5 +17,4 @@ recommended/UpdatePrecheckAlerts/VirtHandlerDaemonSetRolloutFailing/2=False: Reason: Alert:firing Message: warning alert VirtHandlerDaemonSetRolloutFailing firing, suggesting issues worth investigating before updating the cluster. Test summary. The alert description is: Test description. - error: no updates available, so cannot display context for the requested release 1.2.3-not-important diff --git a/pkg/cli/admin/upgrade/recommend/examples/4.22.0-extend-recommended-critical-alert.version-1.2.3-not-important-output b/pkg/cli/admin/upgrade/recommend/examples/4.22.0-extend-recommended-critical-alert.version-1.2.3-not-important-output index 8a85494f0d..566f77a1a6 100644 --- a/pkg/cli/admin/upgrade/recommend/examples/4.22.0-extend-recommended-critical-alert.version-1.2.3-not-important-output +++ b/pkg/cli/admin/upgrade/recommend/examples/4.22.0-extend-recommended-critical-alert.version-1.2.3-not-important-output @@ -7,5 +7,4 @@ recommended/CriticalAlerts/VirtHandlerDaemonSetRolloutFailing/0=False: Reason: Alert:firing Message: critical alert VirtHandlerDaemonSetRolloutFailing firing, suggesting significant cluster issues worth investigating. Test summary. The alert description is: Test description. - error: no updates available, so cannot display context for the requested release 1.2.3-not-important diff --git a/pkg/cli/admin/upgrade/recommend/examples_test.go b/pkg/cli/admin/upgrade/recommend/examples_test.go index 4ebf9f8057..d0424d088f 100644 --- a/pkg/cli/admin/upgrade/recommend/examples_test.go +++ b/pkg/cli/admin/upgrade/recommend/examples_test.go @@ -101,7 +101,7 @@ func TestExamples(t *testing.T) { opts.ErrOut = &stderr if err := opts.Run(context.Background()); err != nil { - compareWithFixture(t, bytes.Join([][]byte{stdout.Bytes(), []byte("\nerror: "), []byte(err.Error()), []byte("\n")}, []byte{}), cv, variant.outputSuffix) + compareWithFixture(t, bytes.Join([][]byte{stdout.Bytes(), []byte("error: "), []byte(err.Error()), []byte("\n")}, []byte{}), cv, variant.outputSuffix) } else { compareWithFixture(t, stdout.Bytes(), cv, variant.outputSuffix) } diff --git a/pkg/cli/admin/upgrade/recommend/recommend.go b/pkg/cli/admin/upgrade/recommend/recommend.go index a852ed33a2..cc6457fa3e 100644 --- a/pkg/cli/admin/upgrade/recommend/recommend.go +++ b/pkg/cli/admin/upgrade/recommend/recommend.go @@ -366,6 +366,9 @@ func (o *options) Run(ctx context.Context) error { } unaccepted := issues.Difference(accept) if unaccepted.Len() > 0 { + if !o.quiet { + fmt.Fprintln(o.Out) + } if cvoChecking { return fmt.Errorf("There are issues that apply to this cluster and have not been accepted. `oc adm upgrade accept` can be used to accept them: %s\n", strings.Join(sets.List(unaccepted), ",")) }