Make it possible to add additional service options

mback2k · Jan 26, 2021 · 181be4f · 181be4f
1 parent 334a10b
commit 181be4f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/rootfs/lib/systemd/system/kube-proxy.service b/rootfs/lib/systemd/system/kube-proxy.service
@@ -8,7 +8,9 @@ RequiresMountsFor=/opt/cni
 
 [Service]
 EnvironmentFile=/run/metadata/torcx
-ExecStart=/usr/bin/env ${TORCX_BINDIR}/kube-proxy --config=/etc/kubernetes/kube-proxy.yaml
+EnvironmentFile=-/etc/default/kubernetes
+ExecStart=/usr/bin/env ${TORCX_BINDIR}/kube-proxy --config=/etc/kubernetes/kube-proxy.yaml \
+  $KUBE_PROXY_OPTIONS
 Restart=always
 RestartSec=5
 LimitNOFILE=65536

diff --git a/rootfs/lib/systemd/system/kubelet.service b/rootfs/lib/systemd/system/kubelet.service
@@ -8,10 +8,12 @@ RequiresMountsFor=/opt/cni
 
 [Service]
 EnvironmentFile=/run/metadata/torcx
+EnvironmentFile=-/etc/default/kubernetes
 ExecStart=/usr/bin/env ${TORCX_BINDIR}/kubelet --config=/etc/kubernetes/kubelet.yaml \
   --container-runtime=remote \
   --container-runtime-endpoint=unix:///run/docker/libcontainerd/docker-containerd.sock \
-  --kubeconfig=/etc/kubernetes/kubelet.kubeconfig
+  --kubeconfig=/etc/kubernetes/kubelet.kubeconfig \
+  $KUBELET_OPTIONS
 Restart=always
 RestartSec=5
 KillMode=process