Fix circular dependency in tasks related to cilium certs

This commit is contained in:
Ole Markus With 2020-10-24 09:27:15 +02:00
parent 1525ccdee9
commit 5c941dee38
1 changed files with 10 additions and 8 deletions

View File

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