From d31b792a58c4363646ca817372e910fd972d7ce5 Mon Sep 17 00:00:00 2001 From: Artiom Diomin Date: Thu, 15 Feb 2024 15:47:33 +0200 Subject: [PATCH 1/2] Update OSM image to fix the flatcar torcx issue Signed-off-by: Artiom Diomin --- pkg/templates/images/images.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/templates/images/images.go b/pkg/templates/images/images.go index dc317b69c..483148384 100644 --- a/pkg/templates/images/images.go +++ b/pkg/templates/images/images.go @@ -213,7 +213,7 @@ func baseResources() map[Resource]map[string]string { Flannel: {"*": "docker.io/flannel/flannel:v0.21.3"}, MachineController: {"*": "quay.io/kubermatic/machine-controller:v1.58.1"}, MetricsServer: {"*": "registry.k8s.io/metrics-server/metrics-server:v0.6.4"}, - OperatingSystemManager: {"*": "quay.io/kubermatic/operating-system-manager:87dae0183459127da1c27a82e8caa361ed5c19ca"}, + OperatingSystemManager: {"*": "quay.io/kubermatic/operating-system-manager:d16de939d7164849ab22f5903d528fcca215b9e9"}, } } From 1284ea3f7c6496cb1e27642fd8da31d6a1413064 Mon Sep 17 00:00:00 2001 From: Artiom Diomin Date: Thu, 15 Feb 2024 16:51:47 +0200 Subject: [PATCH 2/2] Fix flatcar containerd version detection Signed-off-by: Artiom Diomin --- pkg/tasks/probes.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/tasks/probes.go b/pkg/tasks/probes.go index f9eb205d5..b781c4521 100644 --- a/pkg/tasks/probes.go +++ b/pkg/tasks/probes.go @@ -615,7 +615,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 {