[release/v1.43] Flatcar stop disabled units (#1264)

* flatcar/provider.go: added stop command to service mask Signed-off-by: Hendrik Ferber <[email protected]> * Update test data Signed-off-by: Mara Sophie Grosch <[email protected]> * added stop command to userDataIgnitionTemplate Signed-off-by: Hendrik Ferber <[email protected]> * pkg/userdata/flatcar/provider.go: removed unsupported 'command: stop' from userDataIgnitionTemplate Signed-off-by: Hendrik Ferber <[email protected]> Co-authored-by: Hendrik Ferber <[email protected]> Co-authored-by: Mara Sophie Grosch <[email protected]>
kubermatic · Apr 26, 2022 · 28bce9d · 28bce9d
1 parent b653e79
commit 28bce9d
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 0 deletions.
diff --git a/pkg/userdata/flatcar/provider.go b/pkg/userdata/flatcar/provider.go
@@ -450,10 +450,12 @@ coreos:
 {{- end }}
 {{- if .FlatcarConfig.DisableUpdateEngine }}
   - name: update-engine.service
+    command: stop
     mask: true
 {{- end }}
 {{- if .FlatcarConfig.DisableLocksmithD }}
   - name: locksmithd.service
+    command: stop
     mask: true
 {{- end }}
 {{- if .HTTPProxy }}

diff --git a/pkg/userdata/flatcar/testdata/cloud-init_v1.20.14.yaml b/pkg/userdata/flatcar/testdata/cloud-init_v1.20.14.yaml
@@ -24,8 +24,10 @@ coreos:
       DNS=8.8.8.8
 
   - name: update-engine.service
+    command: stop
     mask: true
   - name: locksmithd.service
+    command: stop
     mask: true
   - name: download-script.service
     enable: true

diff --git a/pkg/userdata/flatcar/testdata/cloud-init_v1.21.8.yaml b/pkg/userdata/flatcar/testdata/cloud-init_v1.21.8.yaml
@@ -24,8 +24,10 @@ coreos:
       DNS=8.8.8.8
 
   - name: update-engine.service
+    command: stop
     mask: true
   - name: locksmithd.service
+    command: stop
     mask: true
   - name: download-script.service
     enable: true

diff --git a/pkg/userdata/flatcar/testdata/cloud-init_v1.22.5.yaml b/pkg/userdata/flatcar/testdata/cloud-init_v1.22.5.yaml
@@ -24,8 +24,10 @@ coreos:
       DNS=8.8.8.8
 
   - name: update-engine.service
+    command: stop
     mask: true
   - name: locksmithd.service
+    command: stop
     mask: true
   - name: download-script.service
     enable: true

diff --git a/pkg/userdata/flatcar/testdata/cloud-init_v1.23.0.yaml b/pkg/userdata/flatcar/testdata/cloud-init_v1.23.0.yaml
@@ -24,8 +24,10 @@ coreos:
       DNS=8.8.8.8
 
   - name: update-engine.service
+    command: stop
     mask: true
   - name: locksmithd.service
+    command: stop
     mask: true
   - name: download-script.service
     enable: true

diff --git a/pkg/userdata/flatcar/testdata/containerd.yaml b/pkg/userdata/flatcar/testdata/containerd.yaml
@@ -9,8 +9,10 @@ users:
 coreos:
   units:
   - name: update-engine.service
+    command: stop
     mask: true
   - name: locksmithd.service
+    command: stop
     mask: true
   - name: download-script.service
     enable: true