Merge pull request #1880 from jorge07/flatcar-disable-auto-updates

[v0.12.x] [Unmaintained branch] Disable Flatcar auto-updates
kubernetes-retired · Jul 2, 2020 · e076ef2 · e076ef2
2 parents d268c5a + 67dce01
commit e076ef2
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 21 deletions.
diff --git a/core/controlplane/config/templates/cloud-config-controller b/core/controlplane/config/templates/cloud-config-controller
@@ -38,13 +38,10 @@ coreos:
     reboot-strategy: "off"
   units:
 {{if .DisableContainerLinuxAutomaticUpdates}}
-    - name: disable-automatic-update.service
-      command: start
-      content: |
-        [Unit]
-        Description=Disable Container Linux automatic update. Work around to be removed on Ignition migration.
-        [Service]
-        ExecStart=/usr/bin/sh -c 'for u in update-engine locksmithd; do systemctl stop $${u}.service; systemctl mask $${u}.service; systemctl disable $${u}.service; done; systemctl reset-failed'
+    - name: update-engine.service
+      mask: true
+    - name: locksmithd.service
+      mask: true
 {{end}}
 
     - name: handle-disable-request.service

diff --git a/core/etcd/config/templates/cloud-config-etcd b/core/etcd/config/templates/cloud-config-etcd
@@ -41,13 +41,10 @@ coreos:
     reboot-strategy: "off"
   units:
 {{if .DisableContainerLinuxAutomaticUpdates}}
-    - name: disable-automatic-update.service
-      command: start
-      content: |
-        [Unit]
-        Description=Disable Container Linux automatic update. Work around to be removed on Ignition migration.
-        [Service]
-        ExecStart=/usr/bin/sh -c 'for u in update-engine locksmithd; do systemctl stop $${u}.service; systemctl mask $${u}.service; systemctl disable $${u}.service; done; systemctl reset-failed'
+    - name: update-engine.service
+      mask: true
+    - name: locksmithd.service
+      mask: true
 {{end}}
 {{- range $u := .Etcd.CustomSystemdUnits}}
     - name: {{$u.Name}}

diff --git a/core/nodepool/config/templates/cloud-config-worker b/core/nodepool/config/templates/cloud-config-worker
@@ -40,13 +40,10 @@ coreos:
     reboot-strategy: "off"
   units:
 {{if .DisableContainerLinuxAutomaticUpdates}}
-    - name: disable-automatic-update.service
-      command: start
-      content: |
-        [Unit]
-        Description=Disable Container Linux automatic update. Work around to be removed on Ignition migration.
-        [Service]
-        ExecStart=/usr/bin/sh -c 'for u in update-engine locksmithd; do systemctl stop $${u}.service; systemctl mask $${u}.service; systemctl disable $${u}.service; done; systemctl reset-failed'
+    - name: update-engine.service
+      mask: true
+    - name: locksmithd.service
+      mask: true
 {{end}}
 {{- range $u := .CustomSystemdUnits}}
     - name: {{$u.Name}}