[release/v1.3] Remove hard dependency on torcx, removed in Flatcar 38…

…15.2.0 (#359) Signed-off-by: Marvin Beckers <[email protected]>
kubermatic · Feb 15, 2024 · 312a353 · 312a353
1 parent 7f9aa14
commit 312a353
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/deploy/osps/default/osp-flatcar-cloud-init.yaml b/deploy/osps/default/osp-flatcar-cloud-init.yaml
@@ -175,10 +175,10 @@ spec:
               inline:
                 data: |
                   [Service]
-                  EnvironmentFile=/run/metadata/torcx
+                  EnvironmentFile=-/run/metadata/torcx
                   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}
 
     files:
       - path: /opt/bin/supervise.sh

diff --git a/deploy/osps/default/osp-flatcar.yaml b/deploy/osps/default/osp-flatcar.yaml
@@ -131,10 +131,10 @@ spec:
               inline:
                 data: |
                   [Service]
-                  EnvironmentFile=/run/metadata/torcx
+                  EnvironmentFile=-/run/metadata/torcx
                   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}
 
     templates:
       safeDownloadBinariesScript: |-

diff --git a/pkg/controllers/osc/testdata/osc-flatcar-aws-containerd.yaml b/pkg/controllers/osc/testdata/osc-flatcar-aws-containerd.yaml
@@ -638,10 +638,10 @@ spec:
         inline:
           data: |
             [Service]
-            EnvironmentFile=/run/metadata/torcx
+            EnvironmentFile=-/run/metadata/torcx
             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}
       path: /etc/systemd/system/containerd.service.d/10-custom.conf
       permissions: 644
     units:

diff --git a/pkg/controllers/osc/testdata/secret-flatcar-aws-containerd-provisioning.yaml b/pkg/controllers/osc/testdata/secret-flatcar-aws-containerd-provisioning.yaml