github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-22 10:27:56 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #36472 from xilabao/cert-key-coexist

Browse Source 
Automatic merge from submit-queue

fix apiserver start failed if lost one of cert and key
This commit is contained in:
Kubernetes Submit Queue
2016-12-01 07:52:15 -08:00
committed by GitHub
parent 38ace68c17 7016057ff7
commit 35808b39aa
3 changed files with 31 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cmd/kubelet/app/server.go
View File

@@ -520,7 +520,12 @@ func InitializeTLS(kc *componentconfig.KubeletConfiguration) (*server.TLSOptions
if kc.TLSCertFile == "" && kc.TLSPrivateKeyFile == "" {
kc.TLSCertFile = path.Join(kc.CertDirectory, "kubelet.crt")
kc.TLSPrivateKeyFile = path.Join(kc.CertDirectory, "kubelet.key")
if !certutil.CanReadCertOrKey(kc.TLSCertFile, kc.TLSPrivateKeyFile) {
canReadCertAndKey, err := certutil.CanReadCertAndKey(kc.TLSCertFile, kc.TLSPrivateKeyFile)
if err != nil {
return nil, err
}
if !canReadCertAndKey {
cert, key, err := certutil.GenerateSelfSignedCertKey(nodeutil.GetHostname(kc.HostnameOverride), nil, nil)
if err != nil {
return nil, fmt.Errorf("unable to generate self signed cert: %v", err)