Merge pull request #12178 from hakman/automated-cherry-pick-of-#12177…

…-upstream-release-1.21 Automated cherry pick of #12177: Hardcode Flatcar containerd exec command
kubernetes · Aug 19, 2021 · 5eb4240 · 5eb4240
2 parents c6acb15 + 7f925df
commit 5eb4240
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/nodeup/pkg/model/containerd.go b/nodeup/pkg/model/containerd.go
@@ -248,8 +248,10 @@ func (b *ContainerdBuilder) buildSystemdServiceOverrideContainerOS(c *fi.ModelBu
 func (b *ContainerdBuilder) buildSystemdServiceOverrideFlatcar(c *fi.ModelBuilderContext) {
 	lines := []string{
 		"[Service]",
-		"Environment=CONTAINERD_CONFIG=" + b.containerdConfigFilePath(),
 		"EnvironmentFile=/etc/environment",
+		"Environment=CONTAINERD_CONFIG=" + b.containerdConfigFilePath(),
+		"ExecStart=",
+		"ExecStart=/usr/bin/env PATH=${TORCX_BINDIR}:${PATH} ${TORCX_BINDIR}/containerd --config ${CONTAINERD_CONFIG}",
 	}
 	contents := strings.Join(lines, "\n")
 

diff --git a/nodeup/pkg/model/tests/containerdbuilder/flatcar/tasks.yaml b/nodeup/pkg/model/tests/containerdbuilder/flatcar/tasks.yaml
@@ -28,8 +28,10 @@ afterFiles:
 - /etc/containerd/config-kops.toml
 contents: |-
   [Service]
-  Environment=CONTAINERD_CONFIG=/etc/containerd/config-kops.toml
   EnvironmentFile=/etc/environment
+  Environment=CONTAINERD_CONFIG=/etc/containerd/config-kops.toml
+  ExecStart=
+  ExecStart=/usr/bin/env PATH=${TORCX_BINDIR}:${PATH} ${TORCX_BINDIR}/containerd --config ${CONTAINERD_CONFIG}
 onChangeExecute:
 - - systemctl
   - daemon-reload