terraform: fix ignored ConditionPathExists= in unit files

Over time we've added ConditionPathExists= parameters to several unit files. However, in some instances we were adding them in the [Service] section instead of the [Unit] section. This meant they were ignored and didn't have any effect. This moves those conditions to the [Unit] section.
kinvolk · Jun 30, 2021 · 106c59c · 106c59c
1 parent 06c68de
commit 106c59c
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 21 deletions.
diff --git a/assets/terraform-modules/aws/flatcar-linux/kubernetes/cl/controller.yaml.tmpl b/assets/terraform-modules/aws/flatcar-linux/kubernetes/cl/controller.yaml.tmpl
@@ -9,18 +9,18 @@ systemd:
         Documentation=https://github.com/etcd-io/etcd
         Wants=docker.service
         After=docker.service
-        [Service]
-        Type=simple
-        Restart=always
-        RestartSec=5s
-        TimeoutStartSec=0
-        LimitNOFILE=40000
         ConditionPathExists=/etc/ssl/etcd/etcd/server-ca.crt
         ConditionPathExists=/etc/ssl/etcd/etcd/server.crt
         ConditionPathExists=/etc/ssl/etcd/etcd/server.key
         ConditionPathExists=/etc/ssl/etcd/etcd/peer-ca.crt
         ConditionPathExists=/etc/ssl/etcd/etcd/peer.crt
         ConditionPathExists=/etc/ssl/etcd/etcd/peer.key
+        [Service]
+        Type=simple
+        Restart=always
+        RestartSec=5s
+        TimeoutStartSec=0
+        LimitNOFILE=40000
         EnvironmentFile=/etc/kubernetes/etcd.env
         ExecStartPre=-docker rm -f etcd
         ExecStartPre=sh -c "docker run -d \

diff --git a/assets/terraform-modules/controller/templates/etcd.yaml.tmpl b/assets/terraform-modules/controller/templates/etcd.yaml.tmpl
@@ -8,18 +8,18 @@ systemd:
         Documentation=https://github.com/etcd-io/etcd
         Wants=docker.service
         After=docker.service
-        [Service]
-        Type=simple
-        Restart=always
-        RestartSec=5s
-        TimeoutStartSec=0
-        LimitNOFILE=40000
         ConditionPathExists=/etc/ssl/etcd/etcd/server-ca.crt
         ConditionPathExists=/etc/ssl/etcd/etcd/server.crt
         ConditionPathExists=/etc/ssl/etcd/etcd/server.key
         ConditionPathExists=/etc/ssl/etcd/etcd/peer-ca.crt
         ConditionPathExists=/etc/ssl/etcd/etcd/peer.crt
         ConditionPathExists=/etc/ssl/etcd/etcd/peer.key
+        [Service]
+        Type=simple
+        Restart=always
+        RestartSec=5s
+        TimeoutStartSec=0
+        LimitNOFILE=40000
         EnvironmentFile=/etc/kubernetes/etcd.env
         ExecStartPre=-docker rm -f etcd
         ExecStartPre=sh -c "docker run -d \

diff --git a/assets/terraform-modules/packet/flatcar-linux/kubernetes/cl/controller.yaml.tmpl b/assets/terraform-modules/packet/flatcar-linux/kubernetes/cl/controller.yaml.tmpl
@@ -10,18 +10,18 @@ systemd:
         Wants=docker.service
         After=docker.service create-etcd-config.service
         Requires=create-etcd-config.service
-        [Service]
-        Type=simple
-        Restart=always
-        RestartSec=5s
-        TimeoutStartSec=0
-        LimitNOFILE=40000
         ConditionPathExists=/etc/ssl/etcd/etcd/server-ca.crt
         ConditionPathExists=/etc/ssl/etcd/etcd/server.crt
         ConditionPathExists=/etc/ssl/etcd/etcd/server.key
         ConditionPathExists=/etc/ssl/etcd/etcd/peer-ca.crt
         ConditionPathExists=/etc/ssl/etcd/etcd/peer.crt
         ConditionPathExists=/etc/ssl/etcd/etcd/peer.key
+        [Service]
+        Type=simple
+        Restart=always
+        RestartSec=5s
+        TimeoutStartSec=0
+        LimitNOFILE=40000
         EnvironmentFile=/etc/kubernetes/etcd.config
         EnvironmentFile=/etc/kubernetes/etcd.env
         ExecStartPre=-docker rm -f etcd