kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Apply suggestions from code review 

Co-authored-by: John Gardiner Myers <jgmyers@proofpoint.com>
This commit is contained in:
Ole Markus With 2020-10-09 08:06:14 +02:00 committed by Ole Markus With
parent e7070e334d
commit 466dcd001e
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmd/kops-controller/pkg/server/server.go
View File

@ -179,6 +179,7 @@ func (s *Server) issueCert(name string, pubKey string, id *fi.VerifyResult, vali
issueReq.Subject = pkix.Name{ issueReq.Subject = pkix.Name{
CommonName: id.NodeName, CommonName: id.NodeName,
} }
issueReq.AlternateNames = []string{id.NodeName}
issueReq.Type = "server" issueReq.Type = "server"
case "kube-proxy": case "kube-proxy":
issueReq.Subject = pkix.Name{ issueReq.Subject = pkix.Name{

5
nodeup/pkg/model/kubelet.go
View File

@ -233,8 +233,8 @@ func (b *KubeletBuilder) buildSystemdEnvironmentFile(kubeletConfig *kops.Kubelet
} }
if b.UseKopsControllerForNodeBootstrap() { if b.UseKopsControllerForNodeBootstrap() {
flags += " --tls-cert-file " + b.PathSrvKubernetes() + "/kubelet-server.crt" flags += " --tls-cert-file=" + b.PathSrvKubernetes() + "/kubelet-server.crt"
flags += " --tls-private-key-file " + b.PathSrvKubernetes() + "/kubelet-server.key" flags += " --tls-private-key-file=" + b.PathSrvKubernetes() + "/kubelet-server.key"
} }
sysconfig := "DAEMON_ARGS=\"" + flags + "\"\n" sysconfig := "DAEMON_ARGS=\"" + flags + "\"\n"
@ -587,6 +587,7 @@ func (b *KubeletBuilder) buildKubeletServingCertificate(c *fi.ModelBuilderContex
Subject: nodetasks.PKIXName{ Subject: nodetasks.PKIXName{
CommonName: nodeName, CommonName: nodeName,
}, },
AlternateNames: []string{nodeName},
} }
c.AddTask(issueCert) c.AddTask(issueCert)
return issueCert.AddFileTasks(c, dir, name, "", nil) return issueCert.AddFileTasks(c, dir, name, "", nil)