Skip to content

OTA-1560: pkg/cli/admin/upgrade: Promote 'recommend' to general availability #2076

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-bot merged 2 commits into from
Aug 14, 2025
Merged

OTA-1560: pkg/cli/admin/upgrade: Promote 'recommend' to general availability #2076

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f7f9615
pkg/cli/admin/upgrade/recommend: Hide --mock-clusterversion
wking Aug 13, 2025
f907713
pkg/cli/admin/upgrade: Promote 'recommend' to general availability
wking Aug 13, 2025
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
3 changes: 1 addition & 2 deletions pkg/cli/admin/upgrade/recommend/recommend.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,8 @@ func New(f kcmdutil.Factory, streams genericiooptions.IOStreams) *cobra.Command
flags.StringSliceVar(&o.accept, "accept", o.accept, "Comma-delimited names for issues that you find acceptable. With --version, any unaccepted issues will result in a non-zero exit code.")
}

// TODO: We can remove this flag once the idea about `oc adm upgrade recommend` stabilizes and the command
// is promoted out of the OC_ENABLE_CMD_UPGRADE_RECOMMEND feature gate
flags.StringVar(&o.mockData.cvPath, "mock-clusterversion", "", "Path to a YAML ClusterVersion object to use for testing (will be removed later).")
flags.MarkHidden("mock-clusterversion")
Copy link
Member

@petr-muller petr-muller Aug 14, 2025

Choose a reason for hiding this comment

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

Neat! TIL


return cmd
}
Expand Down
4 changes: 1 addition & 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 @@ -122,9 +122,7 @@ func New(f kcmdutil.Factory, streams genericiooptions.IOStreams) *cobra.Command
if kcmdutil.FeatureGate("OC_ENABLE_CMD_UPGRADE_ROLLBACK").IsEnabled() {
cmd.AddCommand(rollback.New(f, streams))
}
if kcmdutil.FeatureGate("OC_ENABLE_CMD_UPGRADE_RECOMMEND").IsEnabled() {
cmd.AddCommand(recommend.New(f, streams))
}
cmd.AddCommand(recommend.New(f, streams))

return cmd
}
Expand Down