Deprecate --csr-only and --csr-dir flags

wallrj · wallrj · commit 21153e7b6a62 · 2020-07-08T22:14:00.000+01:00
Signed-off-by: Richard Wall &lt;richard.wall@jetstack.io&gt;
diff --git a/cmd/kubeadm/app/cmd/phases/init/certs.go b/cmd/kubeadm/app/cmd/phases/init/certs.go
@@ -66,7 +66,9 @@ func NewCertsPhase() workflow.Phase {
 func localFlags() *pflag.FlagSet {
 	set := pflag.NewFlagSet("csr", pflag.ExitOnError)
 	options.AddCSRFlag(set, &csrOnly)
+	set.MarkDeprecated(options.CSROnly, "This flag will be removed in a future version. Please use kubeadm alpha certs generate-csr instead.")
 	options.AddCSRDirFlag(set, &csrDir)
+	set.MarkDeprecated(options.CSRDir, "This flag will be removed in a future version. Please use kubeadm alpha certs generate-csr instead.")
 	return set
 }
 

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,9 @@ func NewCertsPhase() workflow.Phase {`
`66`	`66`	`func localFlags() *pflag.FlagSet {`
`67`	`67`	`set := pflag.NewFlagSet("csr", pflag.ExitOnError)`
`68`	`68`	`options.AddCSRFlag(set, &csrOnly)`
	`69`	`+ set.MarkDeprecated(options.CSROnly, "This flag will be removed in a future version. Please use kubeadm alpha certs generate-csr instead.")`
`69`	`70`	`options.AddCSRDirFlag(set, &csrDir)`
	`71`	`+ set.MarkDeprecated(options.CSRDir, "This flag will be removed in a future version. Please use kubeadm alpha certs generate-csr instead.")`
`70`	`72`	`return set`
`71`	`73`	`}`
`72`	`74`