Skip to content

Commit b438576

Browse files
Apply suggestions from code review
Co-authored-by: John Gardiner Myers <[email protected]>
1 parent 75b2a87 commit b438576

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

cmd/kops-controller/pkg/server/server.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,7 @@ func (s *Server) issueCert(name string, pubKey string, id *fi.VerifyResult, vali
179179
issueReq.Subject = pkix.Name{
180180
CommonName: id.NodeName,
181181
}
182+
issueReq.AlternateNames = []string{id.NodeName}
182183
issueReq.Type = "server"
183184
case "kube-proxy":
184185
issueReq.Subject = pkix.Name{

nodeup/pkg/model/kubelet.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -233,8 +233,8 @@ func (b *KubeletBuilder) buildSystemdEnvironmentFile(kubeletConfig *kops.Kubelet
233233
}
234234

235235
if b.UseKopsControllerForNodeBootstrap() {
236-
flags += " --tls-cert-file " + b.PathSrvKubernetes() + "/kubelet-server.crt"
237-
flags += " --tls-private-key-file " + b.PathSrvKubernetes() + "/kubelet-server.key"
236+
flags += " --tls-cert-file=" + b.PathSrvKubernetes() + "/kubelet-server.crt"
237+
flags += " --tls-private-key-file=" + b.PathSrvKubernetes() + "/kubelet-server.key"
238238
}
239239

240240
sysconfig := "DAEMON_ARGS=\"" + flags + "\"\n"
@@ -587,6 +587,8 @@ func (b *KubeletBuilder) buildKubeletServingCertificate(c *fi.ModelBuilderContex
587587
Subject: nodetasks.PKIXName{
588588
CommonName: nodeName,
589589
},
590+
AlternateNames: []string{id.NodeName},
591+
590592
}
591593
c.AddTask(issueCert)
592594
return issueCert.AddFileTasks(c, dir, name, "", nil)

0 commit comments

Comments
 (0)