From 15a4ea14e1ddf1c98c69a8cefa65535402357eef Mon Sep 17 00:00:00 2001
From: Feilong Wang <flwang@catalyst.net.nz>
Date: Wed, 23 Oct 2019 12:20:34 +1300
Subject: [PATCH] Support TimeoutStartSec for k8s systemd services

Now Magnum is using podman and systemd to manage the k8s components.
In cases where the nodes pull images from docker.io or another
mirror registry with high latency, some of the components may take long
time to start, which is causing timeout when bootstraping k8s
cluster for fedora atomic/coreos drivers. This patch fixes it by
adding TimeoutStartSec for the systemd services.

Task: 37251
Story: 2006459

Change-Id: I709bac620e4ceec1858672076eb0aef997704b62
---
 .../kubernetes/fragments/configure-kubernetes-master.sh      | 5 +++++
 .../kubernetes/fragments/configure-kubernetes-minion.sh      | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-master.sh b/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-master.sh
index b7e9dd186d..4bc4142a0a 100644
--- a/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-master.sh
+++ b/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-master.sh
@@ -101,6 +101,7 @@ ExecStop=-/usr/bin/podman stop kube-apiserver
 Delegate=yes
 Restart=always
 RestartSec=10
+TimeoutStartSec=10min
 [Install]
 WantedBy=multi-user.target
 EOF
@@ -129,6 +130,7 @@ ExecStop=-/usr/bin/podman stop kube-controller-manager
 Delegate=yes
 Restart=always
 RestartSec=10
+TimeoutStartSec=10min
 [Install]
 WantedBy=multi-user.target
 EOF
@@ -156,6 +158,7 @@ ExecStop=-/usr/bin/podman stop kube-scheduler
 Delegate=yes
 Restart=always
 RestartSec=10
+TimeoutStartSec=10min
 [Install]
 WantedBy=multi-user.target
 EOF
@@ -203,6 +206,7 @@ ExecStop=-/usr/bin/podman stop kubelet
 Delegate=yes
 Restart=always
 RestartSec=10
+TimeoutStartSec=10min
 [Install]
 WantedBy=multi-user.target
 EOF
@@ -234,6 +238,7 @@ ExecStop=-/usr/bin/podman stop kube-proxy
 Delegate=yes
 Restart=always
 RestartSec=10
+TimeoutStartSec=10min
 [Install]
 WantedBy=multi-user.target
 EOF
diff --git a/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-minion.sh b/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-minion.sh
index a9cd2a43cd..317a3153c9 100644
--- a/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-minion.sh
+++ b/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-minion.sh
@@ -101,6 +101,7 @@ ExecStart=/bin/bash -c '/usr/bin/podman run --name kubelet \\
 ExecStop=-/usr/bin/podman stop kubelet
 Delegate=yes
 Restart=always
+TimeoutStartSec=10min
 RestartSec=10
 [Install]
 WantedBy=multi-user.target
@@ -132,6 +133,7 @@ ExecStart=/bin/bash -c '/usr/bin/podman run --name kube-proxy \\
 ExecStop=-/usr/bin/podman stop kube-proxy
 Delegate=yes
 Restart=always
+TimeoutStartSec=10min
 RestartSec=10
 [Install]
 WantedBy=multi-user.target