[release/v1.56] Remove TORCX_BINDIR from containerd binary call (#1763)

* [release/v1.56] Remove TORCX_BINDIR from containerd binary call Signed-off-by: Marvin Beckers <marvin@kubermatic.com> * Bump OSM to v1.2.4 Signed-off-by: Marko Mudrinić <mudrinic.mare@gmail.com> * Fix Hetzner E2E tests Signed-off-by: Marko Mudrinić <mudrinic.mare@gmail.com> * do not use removed yamllint image anymore --------- Signed-off-by: Marvin Beckers <marvin@kubermatic.com> Signed-off-by: Marko Mudrinić <mudrinic.mare@gmail.com> Co-authored-by: Marko Mudrinić <mudrinic.mare@gmail.com> Co-authored-by: Christoph Mewes <christoph@kubermatic.com>
kubermatic · Feb 21, 2024 · e4e0835 · e4e0835
1 parent 91f9179
commit e4e0835
Show file tree

Hide file tree

Showing 11 changed files with 16 additions and 15 deletions.
diff --git a/.prow/verify.yaml b/.prow/verify.yaml
@@ -83,11 +83,12 @@ presubmits:
       preset-goproxy: "true"
     spec:
       containers:
-        - image: quay.io/kubermatic/yamllint:0.1
+        - image: quay.io/kubermatic/build:go-1.19-node-18-18
           command:
-            - "sh"
-            - "-c"
-            - "yamllint -c .yamllint.conf ."
+            - yamllint
+            - -c
+            - .yamllint.conf
+            - .
           resources:
             requests:
               memory: 32Mi

diff --git a/examples/operating-system-manager.yaml b/examples/operating-system-manager.yaml
@@ -975,7 +975,7 @@ spec:
       serviceAccountName: operating-system-manager-webhook
       containers:
         # TODO: Update this to a semver tag before release.
-        - image: quay.io/kubermatic/operating-system-manager:v1.2.3
+        - image: quay.io/kubermatic/operating-system-manager:v1.2.4
           imagePullPolicy: IfNotPresent
           name: webhook
           command:
@@ -1304,7 +1304,7 @@ spec:
       serviceAccountName: operating-system-manager
       containers:
         # TODO: Update this to a semver tag before release.
-        - image: quay.io/kubermatic/operating-system-manager:v1.2.3
+        - image: quay.io/kubermatic/operating-system-manager:v1.2.4
           imagePullPolicy: IfNotPresent
           name: operating-system-manager
           command:

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/test/e2e/provisioning/all_e2e_test.go b/test/e2e/provisioning/all_e2e_test.go
@@ -720,7 +720,7 @@ func TestHetznerProvisioningE2E(t *testing.T) {
 		t.Fatal("unable to run the test suite, HZ_E2E_TOKEN environment variable cannot be empty")
 	}
 
-	selector := OsSelector("ubuntu", "centos", "rockylinux")
+	selector := OsSelector("ubuntu", "rockylinux")
 
 	// act
 	params := []string{fmt.Sprintf("<< HETZNER_TOKEN >>=%s", hzToken)}