[release/v1.7] Fix Flatcar torcx issues (#3041)

* Fix: Use containerd binary from path in Flatcar (#3040) * Use containerd binary from path, as flat removed torcx in their newest release and the binary path has changed Signed-off-by: Kai Fink <kai.fink@yahoo.de> * Updated fixtures Signed-off-by: Kai Fink <kai.fink@yahoo.de> * Secured more backwards compatibility and updated fixtures Signed-off-by: Kai Fink <kai.fink@yahoo.de> --------- Signed-off-by: Kai Fink <kai.fink@yahoo.de> * Update OSM to v1.3.4 Signed-off-by: Artiom Diomin <artiom@kubermatic.com> * Fix flatcar containerd version detection Signed-off-by: Artiom Diomin <artiom@kubermatic.com> --------- Signed-off-by: Kai Fink <kai.fink@yahoo.de> Signed-off-by: Artiom Diomin <artiom@kubermatic.com> Co-authored-by: Kai Fink <kai.fink@yahoo.de>
kubermatic · Feb 15, 2024 · 02dd723 · 02dd723
1 parent ac7511a
commit 02dd723
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
diff --git a/pkg/scripts/render.go b/pkg/scripts/render.go
@@ -222,7 +222,7 @@ var (
 			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
 		`),
 	}

diff --git a/pkg/scripts/testdata/TestKubeadmFlatcar-with_containerd.golden b/pkg/scripts/testdata/TestKubeadmFlatcar-with_containerd.golden
@@ -102,7 +102,7 @@ cat <<EOF | sudo tee /etc/systemd/system/containerd.service.d/10-kubeone.conf
 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
 
 sudo systemctl daemon-reload

diff --git a/pkg/scripts/testdata/TestKubeadmFlatcar-with_containerd_with_insecure_registry.golden b/pkg/scripts/testdata/TestKubeadmFlatcar-with_containerd_with_insecure_registry.golden
@@ -104,7 +104,7 @@ cat <<EOF | sudo tee /etc/systemd/system/containerd.service.d/10-kubeone.conf
 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
 
 sudo systemctl daemon-reload

diff --git a/pkg/scripts/testdata/TestMigrateToContainerd-flatcar.golden b/pkg/scripts/testdata/TestMigrateToContainerd-flatcar.golden
@@ -39,7 +39,7 @@ cat <<EOF | sudo tee /etc/systemd/system/containerd.service.d/10-kubeone.conf
 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
 
 sudo systemctl daemon-reload

diff --git a/pkg/scripts/testdata/TestUpgradeKubeadmAndCNIFlatcar.golden b/pkg/scripts/testdata/TestUpgradeKubeadmAndCNIFlatcar.golden
@@ -52,7 +52,7 @@ cat <<EOF | sudo tee /etc/systemd/system/containerd.service.d/10-kubeone.conf
 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
 
 sudo systemctl daemon-reload

diff --git a/pkg/scripts/testdata/TestUpgradeKubeletAndKubectlFlatcar.golden b/pkg/scripts/testdata/TestUpgradeKubeletAndKubectlFlatcar.golden
@@ -54,7 +54,7 @@ cat <<EOF | sudo tee /etc/systemd/system/containerd.service.d/10-kubeone.conf
 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
 
 sudo systemctl daemon-reload

diff --git a/pkg/tasks/probes.go b/pkg/tasks/probes.go
@@ -645,7 +645,7 @@ func systemdUnitInfo(name string, conn executor.Interface, opts ...systemdUnitIn
 }
 
 func withFlatcarContainerRuntimeVersion(component *state.ComponentStatus, conn executor.Interface) error {
-	cmd := versionCmdGenerator(fmt.Sprintf("/run/torcx/bin/%s", component.Name))
+	cmd := versionCmdGenerator(fmt.Sprintf("PATH=/run/torcx/bin:$PATH %s", component.Name))
 
 	out, _, _, err := conn.Exec(cmd)
 	if err != nil {

diff --git a/pkg/templates/images/images.go b/pkg/templates/images/images.go
@@ -220,7 +220,7 @@ func baseResources() map[Resource]map[string]string {
 		Flannel:                {"*": "docker.io/flannel/flannel:v0.21.3"},
 		MachineController:      {"*": "quay.io/kubermatic/machine-controller:v1.57.4"},
 		MetricsServer:          {"*": "registry.k8s.io/metrics-server/metrics-server:v0.6.4"},
-		OperatingSystemManager: {"*": "quay.io/kubermatic/operating-system-manager:v1.3.3"},
+		OperatingSystemManager: {"*": "quay.io/kubermatic/operating-system-manager:v1.3.4"},
 	}
 }