Merge pull request kubernetes#124393 from carlory/kubeadm-3045-1

Graduate the flag for structural output --experimental-output to just --output

Author: k8s-ci-robot

cmd/kubeadm/app/util/output/output.go

@@ -104,7 +104,9 @@ func (pf *PrintFlags) ToPrinter() (Printer, error) {
 func (pf *PrintFlags) AddFlags(cmd *cobra.Command) {
 	pf.JSONYamlPrintFlags.AddFlags(cmd)
 	pf.KubeTemplatePrintFlags.AddFlags(cmd)
-	cmd.Flags().StringVarP(pf.OutputFormat, "experimental-output", "o", *pf.OutputFormat, fmt.Sprintf("Output format. One of: %s.", strings.Join(pf.AllowedFormats(), "|")))
+	cmd.Flags().StringVarP(pf.OutputFormat, "output", "o", *pf.OutputFormat, fmt.Sprintf("Output format. One of: %s.", strings.Join(pf.AllowedFormats(), "|")))
+	cmd.Flags().StringVarP(pf.OutputFormat, "experimental-output", "", *pf.OutputFormat, fmt.Sprintf("Output format. One of: %s.", strings.Join(pf.AllowedFormats(), "|")))
+	_ = cmd.Flags().MarkDeprecated("experimental-output", "please use --output instead.")
 }
 
 // WithDefaultOutput sets a default output format if one is not provided through a flag value