[release/v1.58] Remove TORCX_BINDIR from containerd binary call (#1761)

* [release/v1.58] Remove TORCX_BINDIR from containerd binary call Signed-off-by: Marvin Beckers <marvin@kubermatic.com> * [release/v1.58] Use OSM v1.4 release branch Signed-off-by: Marvin Beckers <marvin@kubermatic.com> * [release/v1.58] Replace yamllint image Signed-off-by: Marvin Beckers <marvin@kubermatic.com> * Fix AWS spot instance E2E tests Signed-off-by: Marko Mudrinić <mudrinic.mare@gmail.com> * Bump OSM to v1.4.1 Signed-off-by: Marko Mudrinić <mudrinic.mare@gmail.com> --------- 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>
kubermatic · Feb 21, 2024 · 5e4135b · 5e4135b
1 parent 3b0c3a3
commit 5e4135b
Show file tree

Hide file tree

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

diff --git a/Makefile b/Makefile
@@ -67,6 +67,9 @@ clean:
 lint:
 	golangci-lint run -v
 
+yamllint:
+	yamllint -c .yamllint.conf .
+
 .PHONY: docker-image
 docker-image:
 	docker build --build-arg GO_VERSION=$(GO_VERSION) -t $(IMAGE_NAME) .

diff --git a/examples/operating-system-manager.yaml b/examples/operating-system-manager.yaml
@@ -990,7 +990,7 @@ spec:
     spec:
       serviceAccountName: operating-system-manager-webhook
       containers:
-        - image: quay.io/kubermatic/operating-system-manager:v1.4.0
+        - image: quay.io/kubermatic/operating-system-manager:v1.4.1
           imagePullPolicy: Always
           name: webhook
           command:
@@ -1318,7 +1318,7 @@ spec:
     spec:
       serviceAccountName: operating-system-manager
       containers:
-        - image: quay.io/kubermatic/operating-system-manager:latest
+        - image: quay.io/kubermatic/operating-system-manager:v1.4.1
           imagePullPolicy: Always
           name: operating-system-manager
           command:

diff --git a/hack/ci/setup-machine-controller-in-kind.sh b/hack/ci/setup-machine-controller-in-kind.sh
@@ -24,7 +24,7 @@ fi
 export MC_VERSION="${MC_VERSION:-$(git rev-parse HEAD)}"
 export OPERATING_SYSTEM_MANAGER="${OPERATING_SYSTEM_MANAGER:-true}"
 OSM_REPO_URL="${OSM_REPO_URL:-https://github.com/kubermatic/operating-system-manager.git}"
-OSM_REPO_TAG="${OSM_REPO_TAG:-main}"
+OSM_REPO_TAG="${OSM_REPO_TAG:-release/v1.4}"
 
 # cert-manager is required by OSM for generating TLS Certificates
 echodate "Installing cert-manager"

diff --git a/pkg/containerruntime/containerd.go b/pkg/containerruntime/containerd.go
@@ -96,7 +96,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.26.6.yaml b/pkg/userdata/flatcar/testdata/cloud-init_v1.26.6.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.28.0.yaml b/pkg/userdata/flatcar/testdata/cloud-init_v1.28.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.26.6.json b/pkg/userdata/flatcar/testdata/ignition_v1.26.6.json
diff --git a/pkg/userdata/flatcar/testdata/ignition_v1.28.0.json b/pkg/userdata/flatcar/testdata/ignition_v1.28.0.json
diff --git a/test/e2e/provisioning/helper.go b/test/e2e/provisioning/helper.go
@@ -238,7 +238,7 @@ func testScenario(t *testing.T, testCase scenario, cloudProvider string, testPar
 		scenarioParams = append(scenarioParams, fmt.Sprintf("<< DATA_DISK_SIZE >>=%v", 30))
 		scenarioParams = append(scenarioParams, fmt.Sprintf("<< DISK_SIZE >>=%v", 25))
 		scenarioParams = append(scenarioParams, fmt.Sprintf("<< CUSTOM-IMAGE >>=%v", ""))
-		scenarioParams = append(scenarioParams, fmt.Sprintf("<< MAX_PRICE >>=%s", "0.02"))
+		scenarioParams = append(scenarioParams, fmt.Sprintf("<< MAX_PRICE >>=%s", "0.023"))
 	}
 
 	if strings.Contains(cloudProvider, string(providerconfigtypes.CloudProviderEquinixMetal)) {