github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #79369 from SataQiu/fix-kubeadm-1.15-20190625 

kubeadm: improve kubeadm command output
k3s-v1.15.3
Kubernetes Prow Robot 2019-07-03 11:51:42 -07:00 committed by GitHub
parent 93c5b9473c 8f205dbb59
commit 0b72ca4f24
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kubeadm/app/cmd/alpha/certs.go
View File

@ -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.
`)
)

2
cmd/kubeadm/app/cmd/phases/join/controlplaneprepare.go
View File

@ -274,7 +274,7 @@ func runControlPlanePrepareKubeconfigPhaseLocal(c workflow.RunData) error {
// Generate kubeconfig files for controller manager, scheduler and for the admin/kubeadm itself
// NB. The kubeconfig file for kubelet will be generated by the TLS bootstrap process in
// following steps of the join --experimental-control plane workflow
// following steps of the join --control-plane workflow
if err := kubeconfigphase.CreateJoinControlPlaneKubeConfigFiles(kubeadmconstants.KubernetesDir, cfg); err != nil {
return errors.Wrap(err, "error generating kubeconfig files")
}

2
cmd/kubeadm/app/cmd/util/join.go
View File

@ -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

2
cmd/kubeadm/app/phases/copycerts/copycerts.go
View File

@ -258,7 +258,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
}