Merge pull request kubernetes#126914 from carlory/fix-kubeadm-3045

k8s-ci-robot · web-flow · commit e9c9a27c9763 · 2024-08-27T19:17:03.000+01:00
kubeadm remove the deprecated flag '--experimental-output'
diff --git a/cmd/kubeadm/app/util/output/output.go b/cmd/kubeadm/app/util/output/output.go
@@ -105,8 +105,6 @@ func (pf *PrintFlags) AddFlags(cmd *cobra.Command) {
 	pf.JSONYamlPrintFlags.AddFlags(cmd)
 	pf.KubeTemplatePrintFlags.AddFlags(cmd)
 	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

Original file line number	Diff line number	Diff line change
`@@ -105,8 +105,6 @@ func (pf PrintFlags) AddFlags(cmd cobra.Command) {`
`105`	`105`	`pf.JSONYamlPrintFlags.AddFlags(cmd)`
`106`	`106`	`pf.KubeTemplatePrintFlags.AddFlags(cmd)`
`107`	`107`	`cmd.Flags().StringVarP(pf.OutputFormat, "output", "o", *pf.OutputFormat, fmt.Sprintf("Output format. One of: %s.", strings.Join(pf.AllowedFormats(), "\|")))`
`108`		`- cmd.Flags().StringVarP(pf.OutputFormat, "experimental-output", "", *pf.OutputFormat, fmt.Sprintf("Output format. One of: %s.", strings.Join(pf.AllowedFormats(), "\|")))`
`109`		`- _ = cmd.Flags().MarkDeprecated("experimental-output", "please use --output instead.")`
`110`	`108`	`}`
`111`	`109`
`112`	`110`	`// WithDefaultOutput sets a default output format if one is not provided through a flag value`