github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 17:30:00 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Graduate the flag for structural output --experimental-output to just --output
This commit is contained in:
Kubernetes Prow Robot 2024-04-19 06:32:49 -07:00 committed by GitHub
commit f39ece24b2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/kubeadm/app/util/output/output.go
View File

@ -104,7 +104,9 @@ func (pf *PrintFlags) ToPrinter() (Printer, error) {
func (pf *PrintFlags) AddFlags(cmd *cobra.Command) { func (pf *PrintFlags) AddFlags(cmd *cobra.Command) {
pf.JSONYamlPrintFlags.AddFlags(cmd) pf.JSONYamlPrintFlags.AddFlags(cmd)
pf.KubeTemplatePrintFlags.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 // WithDefaultOutput sets a default output format if one is not provided through a flag value