Skip to content

OTA-1581: Promote oc adm upgrade status to general availability #2063

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 19, 2025
Merged

OTA-1581: Promote oc adm upgrade status to general availability #2063

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
cb33bf8
OTA-1581: Promote `oc adm upgrade status` to general availability
petr-muller Jul 22, 2025
aa14293
Update pkg/cli/admin/upgrade/status/status.go
petr-muller Aug 19, 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
6 changes: 2 additions & 4 deletions pkg/cli/admin/upgrade/status/status.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,9 @@ func New(f kcmdutil.Factory, streams genericiooptions.IOStreams) *cobra.Command
}

flags := cmd.Flags()
// TODO: We can remove these flags once the idea about `oc adm upgrade status` stabilizes and the command
// is promoted out of the OC_ENABLE_CMD_UPGRADE_STATUS feature gate
flags.StringVar(&o.mockData.cvPath, "mock-clusterversion", "", "Path to a YAML ClusterVersion object to use for testing (will be removed later). Files in the same directory with the same name and suffixes -co.yaml, -mcp.yaml, -mc.yaml, and -node.yaml are required.")
flags.StringVar(&o.mockData.cvPath, "mock-clusterversion", "", "Path to a YAML ClusterVersion object to use for testing. Files in the same directory with the same name and suffixes -co.yaml, -mcp.yaml, -mc.yaml, and -node.yaml are required.")
flags.StringVar(&o.detailedOutput, "details", "none", fmt.Sprintf("Show detailed output in selected section. One of: %s", strings.Join(detailedOutputAllValues, ", ")))

flags.MarkHidden("mock-clusterversion")
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 @@ -115,10 +115,8 @@ func New(f kcmdutil.Factory, streams genericiooptions.IOStreams) *cobra.Command
flags.BoolVar(&o.AllowNotRecommended, "allow-not-recommended", o.AllowNotRecommended, "Allows upgrade to a version when it is supported but not recommended for updates.")

cmd.AddCommand(channel.New(f, streams))
cmd.AddCommand(status.New(f, streams))

if kcmdutil.FeatureGate("OC_ENABLE_CMD_UPGRADE_STATUS").IsEnabled() {
cmd.AddCommand(status.New(f, streams))
}
if kcmdutil.FeatureGate("OC_ENABLE_CMD_UPGRADE_ROLLBACK").IsEnabled() {
cmd.AddCommand(rollback.New(f, streams))
}
Expand Down