From 694fc522148183e96e6bb84468ba816086e8855c Mon Sep 17 00:00:00 2001 From: Jacob Simpson Date: Thu, 15 Jun 2017 10:35:37 -0700 Subject: [PATCH] Add files specified in the kube config as a potential source of cert/key data. --- cmd/kubelet/app/server.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cmd/kubelet/app/server.go b/cmd/kubelet/app/server.go index 46755d2fd645..2024a0328e25 100644 --- a/cmd/kubelet/app/server.go +++ b/cmd/kubelet/app/server.go @@ -457,7 +457,7 @@ func run(s *options.KubeletServer, kubeDeps *kubelet.KubeletDeps) (err error) { if err != nil { return err } - clientCertificateManager, err = initializeClientCertificateManager(s.CertDirectory, nodeName, clientConfig.CertData, clientConfig.KeyData) + clientCertificateManager, err = initializeClientCertificateManager(s.CertDirectory, nodeName, clientConfig.CertData, clientConfig.KeyData, clientConfig.CertFile, clientConfig.KeyFile) if err != nil { return err } @@ -664,13 +664,13 @@ func updateTransport(clientConfig *restclient.Config, clientCertificateManager c // client that can be used to sign new certificates (or rotate). It answers with // whatever certificate it is initialized with. If a CSR client is set later, it // may begin rotating/renewing the client cert -func initializeClientCertificateManager(certDirectory string, nodeName types.NodeName, certData []byte, keyData []byte) (certificate.Manager, error) { +func initializeClientCertificateManager(certDirectory string, nodeName types.NodeName, certData []byte, keyData []byte, certFile string, keyFile string) (certificate.Manager, error) { certificateStore, err := certificate.NewFileStore( "kubelet-client", certDirectory, certDirectory, - "", - "") + certFile, + keyFile) if err != nil { return nil, fmt.Errorf("failed to initialize certificate store: %v", err) }