From be748e325b615a70ca78603904a85d6e3efd7b5f Mon Sep 17 00:00:00 2001 From: savio87 Date: Tue, 4 Aug 2026 12:22:52 +0530 Subject: [PATCH 1/2] OCPBUGS-8251: fix misleading --to-multi-arch messages --- pkg/cli/admin/upgrade/upgrade.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/cli/admin/upgrade/upgrade.go b/pkg/cli/admin/upgrade/upgrade.go index 6212f85e23..3ddf1babe5 100644 --- a/pkg/cli/admin/upgrade/upgrade.go +++ b/pkg/cli/admin/upgrade/upgrade.go @@ -113,7 +113,7 @@ func New(f kcmdutil.Factory, streams genericiooptions.IOStreams) *cobra.Command flags.StringVar(&o.To, "to", o.To, "Specify the version to upgrade to. The version must be on the list of available updates.") flags.StringVar(&o.ToImage, "to-image", o.ToImage, "Provide a release image to upgrade to.") flags.BoolVar(&o.ToLatestAvailable, "to-latest", o.ToLatestAvailable, "Use the latest (highest Semantic Version) available version.") - flags.BoolVar(&o.ToMultiArch, "to-multi-arch", o.ToMultiArch, "Upgrade current version to multi architecture.") + flags.BoolVar(&o.ToMultiArch, "to-multi-arch", o.ToMultiArch, "Upgrade current version to multi-architecture.") flags.BoolVar(&o.Clear, "clear", o.Clear, "If an upgrade has been requested but not yet downloaded, cancel the update. This has no effect once the update has started.") flags.BoolVar(&o.Force, "force", o.Force, "Upgrade regardless of cluster-side guard failures, such as release verification or upgradeable conditions. Only use this if you are testing unsigned release images or you are working around a known bug in the cluster-version operator and you have verified the authenticity of the provided image yourself.") flags.BoolVar(&o.AllowExplicitUpgrade, "allow-explicit-upgrade", o.AllowExplicitUpgrade, "Upgrade even if the upgrade target is not listed in the available versions list.") @@ -246,7 +246,7 @@ func (o *Options) Run() error { case o.ToMultiArch: if cv.Spec.DesiredUpdate != nil && cv.Spec.DesiredUpdate.Architecture == configv1.ClusterVersionArchitectureMulti { - return fmt.Errorf("info: Update to multi cluster architecture has already been requested") + return fmt.Errorf("Cluster has already been requested to update to multi-architecture") } if err := checkForUpgrade(cv); err != nil { @@ -273,7 +273,7 @@ func (o *Options) Run() error { return err } - fmt.Fprintln(o.Out, "Requested update to multi cluster architecture") + fmt.Fprintln(o.Out, "Requested update to multi-architecture") return nil case o.ToLatestAvailable, len(o.To) > 0, len(o.ToImage) > 0: From 4ec0c86957741bb004efe215e43aea5c5b762d09 Mon Sep 17 00:00:00 2001 From: savio87 Date: Fri, 7 Aug 2026 15:30:58 +0530 Subject: [PATCH 2/2] OCPBUGS-8251: use 'multi-architecture cluster' in success message --- pkg/cli/admin/upgrade/upgrade.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/cli/admin/upgrade/upgrade.go b/pkg/cli/admin/upgrade/upgrade.go index 3ddf1babe5..64abc32799 100644 --- a/pkg/cli/admin/upgrade/upgrade.go +++ b/pkg/cli/admin/upgrade/upgrade.go @@ -273,7 +273,7 @@ func (o *Options) Run() error { return err } - fmt.Fprintln(o.Out, "Requested update to multi-architecture") + fmt.Fprintln(o.Out, "Requested update to multi-architecture cluster") return nil case o.ToLatestAvailable, len(o.To) > 0, len(o.ToImage) > 0: