From 3b4dbe6e301cc12a9250663f026361143ffa5d1d Mon Sep 17 00:00:00 2001 From: SataQiu Date: Fri, 21 Jun 2019 16:31:55 +0800 Subject: [PATCH] kubeadm: cleanup command output --- cmd/kubeadm/app/cmd/alpha/certs.go | 2 +- cmd/kubeadm/app/cmd/util/join.go | 2 +- cmd/kubeadm/app/phases/copycerts/copycerts.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmd/kubeadm/app/cmd/alpha/certs.go b/cmd/kubeadm/app/cmd/alpha/certs.go index 203eb60723a..d9cf923902c 100644 --- a/cmd/kubeadm/app/cmd/alpha/certs.go +++ b/cmd/kubeadm/app/cmd/alpha/certs.go @@ -68,7 +68,7 @@ var ( This command will print out a secure randomly-generated certificate key that can be used with the "init" command. - You can also use "kubeadm init --experimental-upload-certs" without specifying a certificate key and it will + You can also use "kubeadm init --upload-certs" without specifying a certificate key and it will generate and print one for you. `) ) diff --git a/cmd/kubeadm/app/cmd/util/join.go b/cmd/kubeadm/app/cmd/util/join.go index 601a467af89..d045435dad5 100644 --- a/cmd/kubeadm/app/cmd/util/join.go +++ b/cmd/kubeadm/app/cmd/util/join.go @@ -32,7 +32,7 @@ import ( var joinCommandTemplate = template.Must(template.New("join").Parse(`` + `kubeadm join {{.ControlPlaneHostPort}} --token {{.Token}} \ {{range $h := .CAPubKeyPins}}--discovery-token-ca-cert-hash {{$h}} {{end}}{{if .ControlPlane}}\ - --experimental-control-plane {{if .CertificateKey}}--certificate-key {{.CertificateKey}}{{end}}{{end}}`, + --control-plane {{if .CertificateKey}}--certificate-key {{.CertificateKey}}{{end}}{{end}}`, )) // GetJoinWorkerCommand returns the kubeadm join command for a given token and diff --git a/cmd/kubeadm/app/phases/copycerts/copycerts.go b/cmd/kubeadm/app/phases/copycerts/copycerts.go index 10c3aafae60..bd1b119ea83 100644 --- a/cmd/kubeadm/app/phases/copycerts/copycerts.go +++ b/cmd/kubeadm/app/phases/copycerts/copycerts.go @@ -262,7 +262,7 @@ func getSecret(client clientset.Interface) (*v1.Secret, error) { secret, err := client.CoreV1().Secrets(metav1.NamespaceSystem).Get(kubeadmconstants.KubeadmCertsSecret, metav1.GetOptions{}) if err != nil { if apierrors.IsNotFound(err) { - return nil, errors.Errorf("Secret %q was not found in the %q Namespace. This Secret might have expired. Please, run `kubeadm init phase upload-certs --experimental-upload-certs` on a control plane to generate a new one", kubeadmconstants.KubeadmCertsSecret, metav1.NamespaceSystem) + return nil, errors.Errorf("Secret %q was not found in the %q Namespace. This Secret might have expired. Please, run `kubeadm init phase upload-certs --upload-certs` on a control plane to generate a new one", kubeadmconstants.KubeadmCertsSecret, metav1.NamespaceSystem) } return nil, err }