diff --git a/pkg/cli/admin/upgrade/recommend/recommend.go b/pkg/cli/admin/upgrade/recommend/recommend.go index 31a9cdc175..2701f0316d 100644 --- a/pkg/cli/admin/upgrade/recommend/recommend.go +++ b/pkg/cli/admin/upgrade/recommend/recommend.go @@ -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") return cmd } diff --git a/pkg/cli/admin/upgrade/upgrade.go b/pkg/cli/admin/upgrade/upgrade.go index 1f61621e2f..3ffcea1712 100644 --- a/pkg/cli/admin/upgrade/upgrade.go +++ b/pkg/cli/admin/upgrade/upgrade.go @@ -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 }