Cherry-pick 9526e4b - Remove TORCX_BINDIR from containerd binary call (…

…kubermatic#1760)
syseleven · Feb 27, 2024 · abd28f7 · abd28f7
1 parent 41a076c
commit abd28f7
Show file tree

Hide file tree

Showing 11 changed files with 14 additions and 8 deletions.
diff --git a/pkg/containerruntime/containerd.go b/pkg/containerruntime/containerd.go
@@ -97,7 +97,7 @@ cat <<EOF | tee /etc/systemd/system/containerd.service.d/10-machine-controller.c
 Restart=always
 Environment=CONTAINERD_CONFIG=/etc/containerd/config.toml
 ExecStart=
-ExecStart=/usr/bin/env PATH=\${TORCX_BINDIR}:\${PATH} \${TORCX_BINDIR}/containerd --config \${CONTAINERD_CONFIG}
+ExecStart=/usr/bin/env PATH=\${TORCX_BINDIR}:\${PATH} containerd --config \${CONTAINERD_CONFIG}
 EOF
 
 systemctl daemon-reload

diff --git a/pkg/userdata/flatcar/testdata/cloud-init_v1.24.0.yaml b/pkg/userdata/flatcar/testdata/cloud-init_v1.24.0.yaml
@@ -463,7 +463,7 @@ write_files:
     Restart=always
     Environment=CONTAINERD_CONFIG=/etc/containerd/config.toml
     ExecStart=
-    ExecStart=/usr/bin/env PATH=\${TORCX_BINDIR}:\${PATH} \${TORCX_BINDIR}/containerd --config \${CONTAINERD_CONFIG}
+    ExecStart=/usr/bin/env PATH=\${TORCX_BINDIR}:\${PATH} containerd --config \${CONTAINERD_CONFIG}
     EOF
 
     systemctl daemon-reload

diff --git a/pkg/userdata/flatcar/testdata/cloud-init_v1.24.9.yaml b/pkg/userdata/flatcar/testdata/cloud-init_v1.24.9.yaml
@@ -463,7 +463,7 @@ write_files:
     Restart=always
     Environment=CONTAINERD_CONFIG=/etc/containerd/config.toml
     ExecStart=
-    ExecStart=/usr/bin/env PATH=\${TORCX_BINDIR}:\${PATH} \${TORCX_BINDIR}/containerd --config \${CONTAINERD_CONFIG}
+    ExecStart=/usr/bin/env PATH=\${TORCX_BINDIR}:\${PATH} containerd --config \${CONTAINERD_CONFIG}
     EOF
 
     systemctl daemon-reload

diff --git a/pkg/userdata/flatcar/testdata/cloud-init_v1.25.0.yaml b/pkg/userdata/flatcar/testdata/cloud-init_v1.25.0.yaml
@@ -463,7 +463,7 @@ write_files:
     Restart=always
     Environment=CONTAINERD_CONFIG=/etc/containerd/config.toml
     ExecStart=
-    ExecStart=/usr/bin/env PATH=\${TORCX_BINDIR}:\${PATH} \${TORCX_BINDIR}/containerd --config \${CONTAINERD_CONFIG}
+    ExecStart=/usr/bin/env PATH=\${TORCX_BINDIR}:\${PATH} containerd --config \${CONTAINERD_CONFIG}
     EOF
 
     systemctl daemon-reload

diff --git a/pkg/userdata/flatcar/testdata/containerd.yaml b/pkg/userdata/flatcar/testdata/containerd.yaml
@@ -442,7 +442,7 @@ write_files:
     Restart=always
     Environment=CONTAINERD_CONFIG=/etc/containerd/config.toml
     ExecStart=
-    ExecStart=/usr/bin/env PATH=\${TORCX_BINDIR}:\${PATH} \${TORCX_BINDIR}/containerd --config \${CONTAINERD_CONFIG}
+    ExecStart=/usr/bin/env PATH=\${TORCX_BINDIR}:\${PATH} containerd --config \${CONTAINERD_CONFIG}
     EOF
 
     systemctl daemon-reload

diff --git a/pkg/userdata/flatcar/testdata/ignition_v1.24.0.json b/pkg/userdata/flatcar/testdata/ignition_v1.24.0.json
diff --git a/pkg/userdata/flatcar/testdata/ignition_v1.24.9.json b/pkg/userdata/flatcar/testdata/ignition_v1.24.9.json
diff --git a/pkg/userdata/flatcar/testdata/ignition_v1.25.0.json b/pkg/userdata/flatcar/testdata/ignition_v1.25.0.json
diff --git a/pkg/userdata/flatcar/testdata/ignition_v1.26.6.json b/pkg/userdata/flatcar/testdata/ignition_v1.26.6.json
diff --git a/pkg/userdata/flatcar/testdata/ignition_v1.28.5.json b/pkg/userdata/flatcar/testdata/ignition_v1.28.5.json
diff --git a/pkg/userdata/flatcar/testdata/ignition_v1.29.0.json b/pkg/userdata/flatcar/testdata/ignition_v1.29.0.json