Merge pull request #34142 from mikedanese/kubeadm-dep

Automatic merge from submit-queue kubeadm: mark etcd flags as deprecated Lets mark flags that we don't plan on exposing through the command line permanently as deprecated from now on. @kubernetes/sig-cluster-lifecycle

Merge pull request #34142 from mikedanese/kubeadm-dep
b4818983 · Kubernetes Submit Queue · GitHub · 882d431f · db963fc1 · b4818983
Commit b4818983 authored Oct 07, 2016 by Kubernetes Submit Queue Committed by GitHub Oct 07, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 0 deletions

init.go cmd/kubeadm/app/cmd/init.go +7 -0

No files found.
--- a/cmd/kubeadm/app/cmd/init.go
+++ b/cmd/kubeadm/app/cmd/init.go
@@ -92,18 +92,25 @@ func NewCmdInit(out io.Writer) *cobra.Command {
 		&cfg.Etcd.Endpoints, "external-etcd-endpoints", []string{},
 		"etcd endpoints to use, in case you have an external cluster",
 	)
+	cmd.PersistentFlags().MarkDeprecated("external-etcd-endpoints", "this flag will be removed when componentconfig exists")
+
 	cmd.PersistentFlags().StringVar(
 		&cfg.Etcd.CAFile, "external-etcd-cafile", "",
 		"etcd certificate authority certificate file. Note: The path must be in /etc/ssl/certs",
 	)
+	cmd.PersistentFlags().MarkDeprecated("external-etcd-cafile", "this flag will be removed when componentconfig exists")
+
 	cmd.PersistentFlags().StringVar(
 		&cfg.Etcd.CertFile, "external-etcd-certfile", "",
 		"etcd client certificate file. Note: The path must be in /etc/ssl/certs",
 	)
+	cmd.PersistentFlags().MarkDeprecated("external-etcd-certfile", "this flag will be removed when componentconfig exists")
+
 	cmd.PersistentFlags().StringVar(
 		&cfg.Etcd.KeyFile, "external-etcd-keyfile", "",
 		"etcd client key file. Note: The path must be in /etc/ssl/certs",
 	)
+	cmd.PersistentFlags().MarkDeprecated("external-etcd-keyfile", "this flag will be removed when componentconfig exists")

 	return cmd
 }