Skip to content

OCPBUGS-8251: fix misleading --to-multi-arch messages #2339

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

Open
savio87 wants to merge 1 commit into
base: main
Choose a base branch
from
+3 −3
Open

OCPBUGS-8251: fix misleading --to-multi-arch messages #2339

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
6 changes: 3 additions & 3 deletions pkg/cli/admin/upgrade/upgrade.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.")
Expand Down Expand Up @@ -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 {
Expand All @@ -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")

@tchap tchap Aug 4, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Requested update to multi-architecture cluster sounds a bit more complete, thanks.

return nil

case o.ToLatestAvailable, len(o.To) > 0, len(o.ToImage) > 0:
Expand Down