Skip to content
This repository has been archived by the owner on Jun 29, 2022. It is now read-only.

terraform: fix ignored ConditionPathExists= in unit files #1518

Merged
merged 2 commits into from
Jun 30, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down Expand Up @@ -65,7 +65,6 @@ systemd:
Description=Kubelet
Wants=rpc-statd.service
[Service]
invidian marked this conversation as resolved.
Show resolved Hide resolved
ConditionPathExists=/etc/kubernetes/kubeconfig
EnvironmentFile=/etc/kubernetes/kubelet.env
ExecStartPre=/bin/mkdir -p /var/lib/kubelet/volumeplugins
ExecStartPre=/bin/mkdir -p /etc/kubernetes/manifests
Expand Down
1 change: 0 additions & 1 deletion assets/terraform-modules/controller/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ systemd:
- name: 10-controller.conf
contents: |
[Service]
ConditionPathExists=/etc/kubernetes/kubeconfig
ExecStartPre=/bin/mkdir -p /etc/kubernetes/checkpoint-secrets
ExecStartPre=/bin/mkdir -p /etc/kubernetes/inactive-manifests
EOF
Expand Down
12 changes: 6 additions & 6 deletions assets/terraform-modules/controller/templates/etcd.yaml.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
1 change: 0 additions & 1 deletion assets/terraform-modules/node/templates/node.yaml.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ systemd:
Description=Kubelet
Wants=rpc-statd.service
[Service]
ConditionPathExists=/etc/kubernetes/kubeconfig
EnvironmentFile=/etc/kubernetes/kubelet.env
ExecStartPre=/bin/mkdir -p /var/lib/kubelet/volumeplugins
ExecStartPre=/bin/mkdir -p /etc/kubernetes/manifests
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -103,7 +103,6 @@ systemd:
Wants=rpc-statd.service
[Service]
EnvironmentFile=/run/metadata/flatcar
ConditionPathExists=/etc/kubernetes/kubeconfig
EnvironmentFile=/etc/kubernetes/kubelet.env
ExecStartPre=/bin/mkdir -p /var/lib/kubelet/volumeplugins
ExecStartPre=/bin/mkdir -p /etc/kubernetes/manifests
Expand Down
26 changes: 13 additions & 13 deletions pkg/assets/generated_assets.go

Large diffs are not rendered by default.