github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-21 01:26:28 +00:00
Code Issues Projects Releases Wiki Activity

kubeadm: fixed TLS bootstrap.

Browse Source
This commit is contained in:
Paulo Pires 2017-01-11 01:08:31 +00:00
parent 41d7acc0f5
commit d2e0913e68
No known key found for this signature in database
GPG Key ID: F3F6ED5C522EAA71
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
cmd/kubeadm/app/node/csr.go
View File

@ -60,8 +60,7 @@ func PerformTLSBootstrapDeprecated(connection *ConnectionDetails) (*clientcmdapi
return newConfig, nil return newConfig, nil
} }
// PerformTLSBootstrap executes a certificate signing request with the // PerformTLSBootstrap executes a node certificate signing request.
// provided connection details.
func PerformTLSBootstrap(cfg *clientcmdapi.Config) error { func PerformTLSBootstrap(cfg *clientcmdapi.Config) error {
hostName, err := os.Hostname() hostName, err := os.Hostname()
if err != nil { if err != nil {
@ -69,7 +68,7 @@ func PerformTLSBootstrap(cfg *clientcmdapi.Config) error {
} }
name := types.NodeName(hostName) name := types.NodeName(hostName)
rc, err := clientcmd.NewDefaultClientConfig(*cfg, nil).ClientConfig() rc, err := clientcmd.NewDefaultClientConfig(*cfg, &clientcmd.ConfigOverrides{}).ClientConfig()
if err != nil { if err != nil {
return err return err
} }
@ -83,20 +82,22 @@ func PerformTLSBootstrap(cfg *clientcmdapi.Config) error {
if err != nil { if err != nil {
return fmt.Errorf("failed to generate private key [%v]", err) return fmt.Errorf("failed to generate private key [%v]", err)
} }
// Make sure there are no other nodes in the cluster with identical node name.
if err := checkForNodeNameDuplicates(c); err != nil {
return err
}
cert, err := csr.RequestNodeCertificate(c.Certificates().CertificateSigningRequests(), key, name) cert, err := csr.RequestNodeCertificate(c.Certificates().CertificateSigningRequests(), key, name)
if err != nil { if err != nil {
return fmt.Errorf("failed to request signed certificate from the API server [%v]", err) return fmt.Errorf("failed to request signed certificate from the API server [%v]", err)
} }
fmtCert, err := certutil.FormatBytesCert(cert)
if err != nil {
return fmt.Errorf("failed to format certificate [%v]", err)
}
fmt.Printf("[csr] Received signed certificate from the API server") fmt.Printf("[csr] Received signed certificate from the API server")
fmt.Println("[csr] Generating kubelet configuration") fmt.Println("[csr] Generating kubelet configuration")
cfg.AuthInfos["kubelet"] = &clientcmdapi.AuthInfo{ cfg.AuthInfos["kubelet"] = &clientcmdapi.AuthInfo{
ClientKeyData: key, ClientKeyData: key,
ClientCertificateData: []byte(fmtCert), ClientCertificateData: cert,
} }
cfg.Contexts["kubelet"] = &clientcmdapi.Context{ cfg.Contexts["kubelet"] = &clientcmdapi.Context{
AuthInfo: "kubelet", AuthInfo: "kubelet",