Fix kubernetes systemd service templates

There are cases where systemd fails to restart kubernetes services. This change fixes that by inceasing the restart interval in the service templates. Change-Id: I305644a78cee80db43b561e71a532feb414d8322 story: 2006265 task: 35956
openstack · Jul 23, 2019 · 810e811 · 810e811
1 parent a70341e
commit 810e811
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 7 deletions.
diff --git a/dockerfiles/heat-container-agent/service.template b/dockerfiles/heat-container-agent/service.template
@@ -4,8 +4,10 @@ Description=Heat Container Agent system image
 [Service]
 ExecStart=$EXEC_START
 ExecStop=$EXEC_STOP
-Restart=on-failure
 WorkingDirectory=$DESTDIR
+Restart=always
+StartLimitInterval=0
+RestartSec=10
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=multi-user.target
diff --git a/dockerfiles/kubernetes-apiserver/service.template b/dockerfiles/kubernetes-apiserver/service.template
@@ -5,8 +5,10 @@ After=network-online.target
 [Service]
 ExecStart=$EXEC_START
 ExecStop=$EXEC_STOP
-Restart=on-failure
 WorkingDirectory=$DESTDIR
+Restart=always
+StartLimitInterval=0
+RestartSec=10
 
 [Install]
 WantedBy=multi-user.target

diff --git a/dockerfiles/kubernetes-controller-manager/service.template b/dockerfiles/kubernetes-controller-manager/service.template
@@ -4,8 +4,10 @@ Description=kubernetes-controller-manager
 [Service]
 ExecStart=$EXEC_START
 ExecStop=$EXEC_STOP
-Restart=on-failure
 WorkingDirectory=$DESTDIR
+Restart=always
+StartLimitInterval=0
+RestartSec=10
 
 [Install]
 WantedBy=multi-user.target

diff --git a/dockerfiles/kubernetes-kubelet/service.template b/dockerfiles/kubernetes-kubelet/service.template
@@ -5,8 +5,10 @@ After=docker.service
 [Service]
 ExecStart=$EXEC_START
 ExecStop=$EXEC_STOP
-Restart=on-failure
 WorkingDirectory=$DESTDIR
+Restart=always
+StartLimitInterval=0
+RestartSec=10
 
 [Install]
 WantedBy=multi-user.target

diff --git a/dockerfiles/kubernetes-proxy/service.template b/dockerfiles/kubernetes-proxy/service.template
@@ -4,8 +4,10 @@ Description=kubernetes-proxy
 [Service]
 ExecStart=$EXEC_START
 ExecStop=$EXEC_STOP
-Restart=on-failure
 WorkingDirectory=$DESTDIR
+Restart=always
+StartLimitInterval=0
+RestartSec=10
 
 [Install]
 WantedBy=multi-user.target

diff --git a/dockerfiles/kubernetes-scheduler/service.template b/dockerfiles/kubernetes-scheduler/service.template
@@ -4,8 +4,10 @@ Description=kubernetes-scheduler
 [Service]
 ExecStart=$EXEC_START
 ExecStop=$EXEC_STOP
-Restart=on-failure
 WorkingDirectory=$DESTDIR
+Restart=always
+StartLimitInterval=0
+RestartSec=10
 
 [Install]
 WantedBy=multi-user.target