From f14a5a25e002d4c90b1cc8c34a3c7500a5b2fb21 Mon Sep 17 00:00:00 2001 From: Foivos Filippopoulos Date: Mon, 16 Jul 2018 10:26:54 +0100 Subject: [PATCH] Change kubelet service to gc before start --- resources/master-kubelet.service | 3 ++- resources/worker-kubelet.service | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/resources/master-kubelet.service b/resources/master-kubelet.service index 61c5afb..f243639 100644 --- a/resources/master-kubelet.service +++ b/resources/master-kubelet.service @@ -28,7 +28,7 @@ ExecStartPre=/opt/bin/cfssl-keys-and-certs-get ExecStartPre=/opt/bin/cfssl-new-cert ExecStartPre=-/bin/sh -c "docker restart $(docker ps --no-trunc | grep 'kube-controller-manager' | awk '{ print $1; }')" ExecStartPre=-/bin/sh -c "docker restart $(docker ps --no-trunc | grep 'kube-apiserver' | awk '{ print $1; }')" -ExecStartPre=-/usr/bin/rkt rm --uuid-file=/var/run/kubelet-pod.uuid +ExecStartPre=-/usr/bin/rkt gc --grace-period=0s ExecStart=/usr/lib/coreos/kubelet-wrapper \ --kubeconfig=/var/lib/kubelet/kubeconfig \ --node-labels=role=master \ @@ -47,5 +47,6 @@ ExecStart=/usr/lib/coreos/kubelet-wrapper \ ExecStop=-/usr/bin/rkt stop --uuid-file=/var/run/kubelet-pod.uuid Restart=always RestartSec=10 +TimeoutStartSec=3m [Install] WantedBy=multi-user.target diff --git a/resources/worker-kubelet.service b/resources/worker-kubelet.service index 5137353..6e51ae9 100644 --- a/resources/worker-kubelet.service +++ b/resources/worker-kubelet.service @@ -27,7 +27,7 @@ ExecStartPre=/usr/bin/mkdir -p /var/lib/calico # https://github.com/kubernetes/kubernetes/issues/41916#issuecomment-312428731 ExecStartPre=/sbin/sysctl -w net.ipv4.tcp_retries2=8 ExecStartPre=/opt/bin/cfssl-new-cert -ExecStartPre=-/usr/bin/rkt rm --uuid-file=/var/run/kubelet-pod.uuid +ExecStartPre=-/usr/bin/rkt gc --grace-period=0s ExecStart=/usr/lib/coreos/kubelet-wrapper \ --kubeconfig=/var/lib/kubelet/kubeconfig \ --node-labels=role=${role} \ @@ -50,5 +50,6 @@ ExecStart=/usr/lib/coreos/kubelet-wrapper \ ExecStop=-/usr/bin/rkt stop --uuid-file=/var/run/kubelet-pod.uuid Restart=always RestartSec=10 +TimeoutStartSec=3m [Install] WantedBy=multi-user.target