Merge pull request #18040 from juanvallejo/jvallejo/fix-generic-output-rollback

Automatic merge from submit-queue (batch tested with PRs 18040, 18097, 18098, 18106, 18087).

fix -o panic oc rollback

Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1532527

Fix panic caused by a missing `no-headers` flag.
Add support for `json` format output in `oc rollout dc/...`
  - previously, it was possible to specify the flag for the command, but it was ignored

cc @openshift/cli-review @soltysh

Author: openshift-merge-robot

contrib/completions/bash/oc

@@ -15768,6 +15768,8 @@ _oc_rollback()
     flags_with_completion=()
     flags_completion=()
 
+    flags+=("--allow-missing-template-keys")
+    local_nonpersistent_flags+=("--allow-missing-template-keys")
     flags+=("--change-scaling-settings")
     local_nonpersistent_flags+=("--change-scaling-settings")
     flags+=("--change-strategy")
@@ -15777,15 +15779,23 @@ _oc_rollback()
     flags+=("--dry-run")
     flags+=("-d")
     local_nonpersistent_flags+=("--dry-run")
+    flags+=("--no-headers")
+    local_nonpersistent_flags+=("--no-headers")
     flags+=("--output=")
     two_word_flags+=("-o")
     local_nonpersistent_flags+=("--output=")
+    flags+=("--output-version=")
+    local_nonpersistent_flags+=("--output-version=")
+    flags+=("--show-all")
+    flags+=("-a")
+    local_nonpersistent_flags+=("--show-all")
+    flags+=("--show-labels")
+    local_nonpersistent_flags+=("--show-labels")
+    flags+=("--sort-by=")
+    local_nonpersistent_flags+=("--sort-by=")
     flags+=("--template=")
     flags_with_completion+=("--template")
     flags_completion+=("_filedir")
-    two_word_flags+=("-t")
-    flags_with_completion+=("-t")
-    flags_completion+=("_filedir")
     local_nonpersistent_flags+=("--template=")
     flags+=("--to-version=")
     local_nonpersistent_flags+=("--to-version=")

contrib/completions/zsh/oc

@@ -15910,6 +15910,8 @@ _oc_rollback()
     flags_with_completion=()
     flags_completion=()
 
+    flags+=("--allow-missing-template-keys")
+    local_nonpersistent_flags+=("--allow-missing-template-keys")
     flags+=("--change-scaling-settings")
     local_nonpersistent_flags+=("--change-scaling-settings")
     flags+=("--change-strategy")
@@ -15919,15 +15921,23 @@ _oc_rollback()
     flags+=("--dry-run")
     flags+=("-d")
     local_nonpersistent_flags+=("--dry-run")
+    flags+=("--no-headers")
+    local_nonpersistent_flags+=("--no-headers")
     flags+=("--output=")
     two_word_flags+=("-o")
     local_nonpersistent_flags+=("--output=")
+    flags+=("--output-version=")
+    local_nonpersistent_flags+=("--output-version=")
+    flags+=("--show-all")
+    flags+=("-a")
+    local_nonpersistent_flags+=("--show-all")
+    flags+=("--show-labels")
+    local_nonpersistent_flags+=("--show-labels")
+    flags+=("--sort-by=")
+    local_nonpersistent_flags+=("--sort-by=")
     flags+=("--template=")
     flags_with_completion+=("--template")
     flags_completion+=("_filedir")
-    two_word_flags+=("-t")
-    flags_with_completion+=("-t")
-    flags_completion+=("_filedir")
     local_nonpersistent_flags+=("--template=")
     flags+=("--to-version=")
     local_nonpersistent_flags+=("--to-version=")

pkg/oc/cli/cmd/rollback.go

@@ -56,7 +56,10 @@ var (
 	  %[1]s rollback frontend-2
 
 	  # Perform the rollback manually by piping the JSON of the new config back to %[1]s
-	  %[1]s rollback frontend -o json | %[1]s replace dc/frontend -f -`)
+	  %[1]s rollback frontend -o json | %[1]s replace dc/frontend -f -
+
+	  # Print the updated deployment configuration in JSON format instead of performing the rollback
+	  %[1]s rollback frontend -o json`)
 )
 
 // NewCmdRollback creates a CLI rollback command.
@@ -86,9 +89,9 @@ func NewCmdRollback(fullName string, f *clientcmd.Factory, out io.Writer) *cobra
 	cmd.Flags().BoolVar(&opts.IncludeStrategy, "change-strategy", false, "If true, include the previous deployment's strategy in the rollback")
 	cmd.Flags().BoolVar(&opts.IncludeScalingSettings, "change-scaling-settings", false, "If true, include the previous deployment's replicationController replica count and selector in the rollback")
 	cmd.Flags().BoolVarP(&opts.DryRun, "dry-run", "d", false, "Instead of performing the rollback, describe what the rollback will look like in human-readable form")
-	cmd.Flags().StringVarP(&opts.Format, "output", "o", "", "Instead of performing the rollback, print the updated deployment configuration in the specified format (json|yaml|name|template|templatefile)")
-	cmd.Flags().StringVarP(&opts.Template, "template", "t", "", "Template string or path to template file to use when -o=template or -o=templatefile.")
 	cmd.MarkFlagFilename("template")
+
+	kcmdutil.AddPrinterFlags(cmd)
 	cmd.Flags().Int64Var(&opts.DesiredVersion, "to-version", 0, "A config version to rollback to. Specifying version 0 is the same as omitting a version (the version will be auto-detected). This option is ignored when specifying a deployment.")
 
 	return cmd
@@ -151,6 +154,8 @@ func (o *RollbackOptions) Complete(f *clientcmd.Factory, cmd *cobra.Command, arg
 
 	o.out = out
 
+	o.Format = kcmdutil.GetFlagString(cmd, "output")
+
 	if len(o.Format) > 0 {
 		o.printer, err = f.PrinterForOptions(kcmdutil.ExtractCmdPrintOptions(cmd, false))
 		if err != nil {

pkg/oc/cli/cmd/rollout/latest.go

@@ -14,6 +14,7 @@ import (
 	"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
 	kcmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
 	"k8s.io/kubernetes/pkg/kubectl/resource"
+	kprinters "k8s.io/kubernetes/pkg/printers"
 
 	appsapi "github.com/openshift/origin/pkg/apps/apis/apps"
 	appsclientinternal "github.com/openshift/origin/pkg/apps/generated/internalclientset/typed/apps/internalversion"
@@ -32,8 +33,11 @@ var (
 		your image change triggers.`)
 
 	rolloutLatestExample = templates.Examples(`
-		# Start a new rollout based on the latest images defined in the image change triggers.
-  	%[1]s rollout latest dc/nginx`)
+	# Start a new rollout based on the latest images defined in the image change triggers.
+	%[1]s rollout latest dc/nginx
+
+	# Print the rolled out deployment config
+	%[1]s rollout latest dc/nginx -o json`)
 )
 
 // RolloutLatestOptions holds all the options for the `rollout latest` command.
@@ -50,6 +54,8 @@ type RolloutLatestOptions struct {
 	appsClient      appsclientinternal.DeploymentConfigsGetter
 	kc              kclientset.Interface
 	baseCommandName string
+
+	printer kprinters.ResourcePrinter
 }
 
 // NewCmdRolloutLatest implements the oc rollout latest subcommand.
@@ -122,6 +128,13 @@ func (o *RolloutLatestOptions) Complete(f *clientcmd.Factory, cmd *cobra.Command
 	o.output = kcmdutil.GetFlagString(cmd, "output")
 	o.again = kcmdutil.GetFlagBool(cmd, "again")
 
+	if o.output != "revision" {
+		o.printer, err = f.PrinterForOptions(kcmdutil.ExtractCmdPrintOptions(cmd, false))
+		if err != nil {
+			return err
+		}
+	}
+
 	return nil
 }
 
@@ -185,6 +198,8 @@ func (o RolloutLatestOptions) RunRolloutLatest() error {
 	if o.output == "revision" {
 		fmt.Fprintf(o.out, fmt.Sprintf("%d", dc.Status.LatestVersion))
 		return nil
+	} else if len(o.output) > 0 {
+		return o.printer.PrintObj(dc, o.out)
 	}
 
 	kcmdutil.PrintSuccess(o.mapper, o.output == "name", o.out, info.Mapping.Resource, info.Name, o.DryRun, "rolled out")