Fix old node templates

sapcc · Sep 12, 2023 · 54c5a35 · 54c5a35
1 parent e123af9
commit 54c5a35
Show file tree

Hide file tree

Showing 8 changed files with 110 additions and 86 deletions.
diff --git a/pkg/templates/node_1.10.go b/pkg/templates/node_1.10.go
@@ -3,6 +3,8 @@
 package templates
 
 var Node_1_10 = `
+variant: flatcar
+version: 1.0.0
 passwd:
   users:
     - name:          core
@@ -18,7 +20,7 @@ passwd:
 systemd:
   units:
     - name: legacy-cgroup-reboot.service
-      enable: true
+      enabled: true
       contents: |
         [Unit]
         Description=Reboot if legacy cgroups are not enabled yet
@@ -30,9 +32,9 @@ systemd:
         [Install]
         WantedBy=multi-user.target
     - name: iptables-restore.service
-      enable: true
+      enabled: true
     - name: ccloud-metadata-hostname.service
-      enable: true
+      enabled: true
       contents: |
         [Unit]
         Description=Workaround for coreos-metadata hostname bug
@@ -46,15 +48,15 @@ systemd:
         [Install]
         WantedBy=multi-user.target
     - name: docker.service
-      enable: true
+      enabled: true
       dropins:
         - name: 20-docker-opts.conf
           contents: |
             [Service]
             Environment="DOCKER_OPTS=--log-opt max-size=5m --log-opt max-file=5 --ip-masq=false --iptables=false --bridge=none"
             Environment="DOCKER_CGROUPS=--exec-opt native.cgroupdriver=cgroupfs"
     - name: flanneld.service
-      enable: true
+      enabled: true
       contents: |
         [Unit]
         Description=flannel - Network fabric for containers (System Application Container)
@@ -99,7 +101,7 @@ systemd:
                                       --volume etc-kube-flannel,kind=host,source=/etc/kube-flannel,readOnly=true \
                                       --mount volume=etc-kube-flannel,target=/etc/kube-flannel"
     - name: flannel-docker-opts.service
-      enable: true
+      enabled: true
       contents: |
         [Unit]
         PartOf=flanneld.service
@@ -109,7 +111,7 @@ systemd:
         Type=oneshot
         ExecStart=/bin/true
     - name: kubelet.service
-      enable: true
+      enabled: true
       contents: |
         [Unit]
         Description=Kubelet via Hyperkube ACI
@@ -207,14 +209,14 @@ systemd:
         Restart=always
         RestartSec=10s
     - name: wormhole.path
-      enable: true
+      enabled: true
       contents: |
         [Path]
         PathExists=/var/lib/kubelet/kubeconfig
         [Install]
         WantedBy=multi-user.target
     - name: kube-proxy.service
-      enable: true
+      enabled: true
       contents: |
         [Unit]
         Description=Kube-Proxy
@@ -248,7 +250,7 @@ systemd:
         WantedBy=multi-user.target
     - name: updatecertificates.service
       command: start
-      enable: true
+      enabled: true
       contents: |
         [Unit]
         Description=Update the certificates w/ self-signed root CAs
@@ -262,7 +264,7 @@ systemd:
         WantedBy=multi-user.target
     - name: fix-cert-rotation.service
       command: start
-      enable: true
+      enabled: true
       contents: |
         [Unit]
         Description=Fix kubelet certificate rotation
@@ -283,7 +285,7 @@ systemd:
         Type=oneshot
         ExecStart=/opt/bin/rkt gc --grace-period=${GRACE_PERIOD}
     - name: rkt-gc.timer
-      enable: true
+      enabled: true
       command: start
       contents: |
         [Unit]
@@ -310,6 +312,7 @@ storage:
     - path: /etc/systemd/resolved.conf
       filesystem: root
       mode: 0644
+      overwrite: true
       contents:
         inline: |
           [Resolve]

diff --git a/pkg/templates/node_1.11.go b/pkg/templates/node_1.11.go
@@ -3,6 +3,8 @@
 package templates
 
 var Node_1_11 = `
+variant: flatcar
+version: 1.0.0
 passwd:
   users:
     - name:          core
@@ -18,7 +20,7 @@ passwd:
 systemd:
   units:
     - name: legacy-cgroup-reboot.service
-      enable: true
+      enabled: true
       contents: |
         [Unit]
         Description=Reboot if legacy cgroups are not enabled yet
@@ -30,9 +32,9 @@ systemd:
         [Install]
         WantedBy=multi-user.target
     - name: iptables-restore.service
-      enable: true
+      enabled: true
     - name: ccloud-metadata-hostname.service
-      enable: true
+      enabled: true
       contents: |
         [Unit]
         Description=Workaround for coreos-metadata hostname bug
@@ -46,15 +48,15 @@ systemd:
         [Install]
         WantedBy=multi-user.target
     - name: docker.service
-      enable: true
+      enabled: true
       dropins:
         - name: 20-docker-opts.conf
           contents: |
             [Service]
             Environment="DOCKER_OPTS=--log-opt max-size=5m --log-opt max-file=5 --ip-masq=false --iptables=false --bridge=none"
             Environment="DOCKER_CGROUPS=--exec-opt native.cgroupdriver=cgroupfs"
     - name: flanneld.service
-      enable: true
+      enabled: true
       contents: |
         [Unit]
         Description=flannel - Network fabric for containers (System Application Container)
@@ -99,7 +101,7 @@ systemd:
                                       --volume etc-kube-flannel,kind=host,source=/etc/kube-flannel,readOnly=true \
                                       --mount volume=etc-kube-flannel,target=/etc/kube-flannel"
     - name: flannel-docker-opts.service
-      enable: true
+      enabled: true
       contents: |
         [Unit]
         PartOf=flanneld.service
@@ -109,7 +111,7 @@ systemd:
         Type=oneshot
         ExecStart=/bin/true
     - name: kubelet.service
-      enable: true
+      enabled: true
       contents: |
         [Unit]
         Description=Kubelet via Hyperkube ACI
@@ -205,14 +207,14 @@ systemd:
         Restart=always
         RestartSec=10s
     - name: wormhole.path
-      enable: true
+      enabled: true
       contents: |
         [Path]
         PathExists=/var/lib/kubelet/kubeconfig
         [Install]
         WantedBy=multi-user.target
     - name: kube-proxy.service
-      enable: true
+      enabled: true
       contents: |
         [Unit]
         Description=Kube-Proxy
@@ -246,7 +248,7 @@ systemd:
         WantedBy=multi-user.target
     - name: updatecertificates.service
       command: start
-      enable: true
+      enabled: true
       contents: |
         [Unit]
         Description=Update the certificates w/ self-signed root CAs
@@ -268,7 +270,7 @@ systemd:
         Type=oneshot
         ExecStart=/opt/bin/rkt gc --grace-period=${GRACE_PERIOD}
     - name: rkt-gc.timer
-      enable: true
+      enabled: true
       command: start
       contents: |
         [Unit]
@@ -296,6 +298,7 @@ storage:
     - path: /etc/systemd/resolved.conf
       filesystem: root
       mode: 0644
+      overwrite: true
       contents:
         inline: |
           [Resolve]

diff --git a/pkg/templates/node_1.12.go b/pkg/templates/node_1.12.go
@@ -3,6 +3,8 @@
 package templates
 
 var Node_1_12 = `
+variant: flatcar
+version: 1.0.0
 passwd:
   users:
     - name:          core
@@ -18,7 +20,7 @@ passwd:
 systemd:
   units:
     - name: legacy-cgroup-reboot.service
-      enable: true
+      enabled: true
       contents: |
         [Unit]
         Description=Reboot if legacy cgroups are not enabled yet
@@ -30,9 +32,9 @@ systemd:
         [Install]
         WantedBy=multi-user.target
     - name: iptables-restore.service
-      enable: true
+      enabled: true
     - name: ccloud-metadata-hostname.service
-      enable: true
+      enabled: true
       contents: |
         [Unit]
         Description=Workaround for coreos-metadata hostname bug
@@ -46,15 +48,15 @@ systemd:
         [Install]
         WantedBy=multi-user.target
     - name: docker.service
-      enable: true
+      enabled: true
       dropins:
         - name: 20-docker-opts.conf
           contents: |
             [Service]
             Environment="DOCKER_OPTS=--log-opt max-size=5m --log-opt max-file=5 --ip-masq=false --iptables=false --bridge=none"
             Environment="DOCKER_CGROUPS=--exec-opt native.cgroupdriver=cgroupfs"
     - name: flanneld.service
-      enable: true
+      enabled: true
       contents: |
         [Unit]
         Description=flannel - Network fabric for containers (System Application Container)
@@ -99,7 +101,7 @@ systemd:
                                       --volume etc-kube-flannel,kind=host,source=/etc/kube-flannel,readOnly=true \
                                       --mount volume=etc-kube-flannel,target=/etc/kube-flannel"
     - name: flannel-docker-opts.service
-      enable: true
+      enabled: true
       contents: |
         [Unit]
         PartOf=flanneld.service
@@ -109,7 +111,7 @@ systemd:
         Type=oneshot
         ExecStart=/bin/true
     - name: kubelet.service
-      enable: true
+      enabled: true
       contents: |
         [Unit]
         Description=Kubelet via Hyperkube ACI
@@ -205,14 +207,14 @@ systemd:
         Restart=always
         RestartSec=10s
     - name: wormhole.path
-      enable: true
+      enabled: true
       contents: |
         [Path]
         PathExists=/var/lib/kubelet/kubeconfig
         [Install]
         WantedBy=multi-user.target
     - name: kube-proxy.service
-      enable: true
+      enabled: true
       contents: |
         [Unit]
         Description=Kube-Proxy
@@ -246,7 +248,7 @@ systemd:
         WantedBy=multi-user.target
     - name: updatecertificates.service
       command: start
-      enable: true
+      enabled: true
       contents: |
         [Unit]
         Description=Update the certificates w/ self-signed root CAs
@@ -267,7 +269,7 @@ systemd:
         Type=oneshot
         ExecStart=/opt/bin/rkt gc --grace-period=${GRACE_PERIOD}
     - name: rkt-gc.timer
-      enable: true
+      enabled: true
       command: start
       contents: |
         [Unit]
@@ -294,6 +296,7 @@ storage:
     - path: /etc/systemd/resolved.conf
       filesystem: root
       mode: 0644
+      overwrite: true
       contents:
         inline: |
           [Resolve]