From 28bce9def64b1df4739a5744099969545fec445f Mon Sep 17 00:00:00 2001 From: Kubermatic Bot <41968677+kubermatic-bot@users.noreply.github.com> Date: Tue, 26 Apr 2022 10:16:47 +0200 Subject: [PATCH] [release/v1.43] Flatcar stop disabled units (#1264) * flatcar/provider.go: added stop command to service mask Signed-off-by: Hendrik Ferber * Update test data Signed-off-by: Mara Sophie Grosch * added stop command to userDataIgnitionTemplate Signed-off-by: Hendrik Ferber * pkg/userdata/flatcar/provider.go: removed unsupported 'command: stop' from userDataIgnitionTemplate Signed-off-by: Hendrik Ferber Co-authored-by: Hendrik Ferber Co-authored-by: Mara Sophie Grosch --- pkg/userdata/flatcar/provider.go | 2 ++ pkg/userdata/flatcar/testdata/cloud-init_v1.20.14.yaml | 2 ++ pkg/userdata/flatcar/testdata/cloud-init_v1.21.8.yaml | 2 ++ pkg/userdata/flatcar/testdata/cloud-init_v1.22.5.yaml | 2 ++ pkg/userdata/flatcar/testdata/cloud-init_v1.23.0.yaml | 2 ++ pkg/userdata/flatcar/testdata/containerd.yaml | 2 ++ 6 files changed, 12 insertions(+) diff --git a/pkg/userdata/flatcar/provider.go b/pkg/userdata/flatcar/provider.go index 45f93a5c8..c979ece67 100644 --- 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 index 20b48a9b5..119b660e6 100644 --- 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 index bc9e03f0a..2ed1d9706 100644 --- 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 index 8e28e9949..be9912c58 100644 --- 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 index bf4d03c73..1707d1d21 100644 --- 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 index a6f63ee8a..5097c5537 100644 --- 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