Merge pull request #10093 from olemarkus/automated-cherry-pick-of-#10…

…092-origin-release-1.19 Automated cherry pick of #10092: Fix circular dependency in tasks related to kubelet
kubernetes · Oct 24, 2020 · 41bc556 · 41bc556
2 parents 876c239 + 879b445
commit 41bc556
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 16 deletions.
diff --git a/nodeup/pkg/model/kubelet.go b/nodeup/pkg/model/kubelet.go
@@ -566,17 +566,19 @@ func (b *KubeletBuilder) buildKubeletServingCertificate(c *fi.ModelBuilderContex
 			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"},
 			})
 
 		} else {

diff --git a/nodeup/pkg/model/networking/cilium.go b/nodeup/pkg/model/networking/cilium.go
@@ -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)