mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-31 23:37:01 +00:00
Merge pull request #124393 from carlory/kubeadm-3045-1
Graduate the flag for structural output --experimental-output to just --output
This commit is contained in:
commit
f39ece24b2
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user