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

Merge pull request #10092 from olemarkus/kubelet-cert-circular-dep 

Cert circular deps
This commit is contained in:
Kubernetes Prow Robot 2020-10-24 02:37:01 -07:00 committed by GitHub
parent 51511ba59b 5c941dee38
commit 9e67613543
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -566,17 +566,19 @@ func (b *KubeletBuilder) buildKubeletServingCertificate(c *fi.ModelBuilderContex
cert, key := b.GetBootstrapCert(name) cert, key := b.GetBootstrapCert(name)
c.AddTask(&nodetasks.File{ c.AddTask(&nodetasks.File{
Path: filepath.Join(dir, name+".crt"), Path: filepath.Join(dir, name+".crt"),
Contents: cert, Contents: cert,
Type: nodetasks.FileType_File, Type: nodetasks.FileType_File,
Mode: fi.String("0644"), Mode: fi.String("0644"),
BeforeServices: []string{"kubelet.service"},
}) })
c.AddTask(&nodetasks.File{ c.AddTask(&nodetasks.File{
Path: filepath.Join(dir, name+".key"), Path: filepath.Join(dir, name+".key"),
Contents: key, Contents: key,
Type: nodetasks.FileType_File, Type: nodetasks.FileType_File,
Mode: fi.String("0400"), Mode: fi.String("0400"),
BeforeServices: []string{"kubelet.service"},
}) })
} else { } else {

18
nodeup/pkg/model/networking/cilium.go
View File

@ -131,17 +131,19 @@ func (b *CiliumBuilder) buildCiliumEtcdSecrets(c *fi.ModelBuilderContext) error
cert, key := b.GetBootstrapCert(name) cert, key := b.GetBootstrapCert(name)
c.AddTask(&nodetasks.File{ c.AddTask(&nodetasks.File{
Path: filepath.Join(dir, name+".crt"), Path: filepath.Join(dir, name+".crt"),
Contents: cert, Contents: cert,
Type: nodetasks.FileType_File, Type: nodetasks.FileType_File,
Mode: fi.String("0644"), Mode: fi.String("0644"),
BeforeServices: []string{"kubelet.service"},
}) })
c.AddTask(&nodetasks.File{ c.AddTask(&nodetasks.File{
Path: filepath.Join(dir, name+".key"), Path: filepath.Join(dir, name+".key"),
Contents: key, Contents: key,
Type: nodetasks.FileType_File, Type: nodetasks.FileType_File,
Mode: fi.String("0400"), Mode: fi.String("0400"),
BeforeServices: []string{"kubelet.service"},
}) })
return b.BuildCertificateTask(c, signer, filepath.Join(dir, "etcd-ca.crt"), nil) return b.BuildCertificateTask(c, signer, filepath.Join(dir, "etcd-ca.crt"), nil)