From 67dce01d7a5db016c2ec01219bfeecb4c54ddbad Mon Sep 17 00:00:00 2001
From: Jorge Arco <jorge.arcoma@gmail.com>
Date: Thu, 2 Jul 2020 01:23:37 +0200
Subject: [PATCH] Disable Flatcar auto-updates

---
 .../config/templates/cloud-config-controller          | 11 ++++-------
 core/etcd/config/templates/cloud-config-etcd          | 11 ++++-------
 core/nodepool/config/templates/cloud-config-worker    | 11 ++++-------
 3 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/core/controlplane/config/templates/cloud-config-controller b/core/controlplane/config/templates/cloud-config-controller
index 88213de39..af05e310a 100644
--- 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
index 58b62f249..c2e75282d 100644
--- 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
index 5d8194369..406699b07 100644
--- 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}}