From ae145b78f8b8891ac718fa2a4ea4b5c5a510c306 Mon Sep 17 00:00:00 2001 From: Bart Wensley Date: Wed, 24 Jul 2019 14:47:56 -0500 Subject: [PATCH] Revert "Revert "Changing tiller pod networking settings to improve swact time"" This reverts commit a5c236dc522c050b036e638955c03074a2963996. It was thought that setting the TCP timeouts for the cluster network was enough to address the issues with the helm commands hanging after a controller swact. This is not the case. In particular, swacting away from the controller with the tiller-deploy pod seems to cause tcp connection from that pod to the kube-apiserver to hang. Putting the tiller-deploy pod back on the host network "fixes" the issue. Change-Id: I8f37530e1f615afcffcf6cb1d629518436c99cb9 Related-Bug: 1817941 Partial-Bug: 1837055 Signed-off-by: Bart Wensley --- puppet-manifests/src/modules/platform/manifests/helm.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/puppet-manifests/src/modules/platform/manifests/helm.pp b/puppet-manifests/src/modules/platform/manifests/helm.pp index 84742caebf..ab44c1aa59 100644 --- a/puppet-manifests/src/modules/platform/manifests/helm.pp +++ b/puppet-manifests/src/modules/platform/manifests/helm.pp @@ -133,7 +133,7 @@ class platform::helm -> exec { 'initialize helm': environment => [ 'KUBECONFIG=/etc/kubernetes/admin.conf', 'HOME=/home/sysadmin' ], - command => "helm init --skip-refresh --service-account tiller --node-selectors \"node-role.kubernetes.io/master\"=\"\" --tiller-image=${gcr_registry}/kubernetes-helm/tiller:v2.13.1", # lint:ignore:140chars + command => "helm init --skip-refresh --service-account tiller --node-selectors \"node-role.kubernetes.io/master\"=\"\" --tiller-image=${gcr_registry}/kubernetes-helm/tiller:v2.13.1 --override spec.template.spec.hostNetwork=true", # lint:ignore:140chars logoutput => true, user => 'sysadmin', group => 'sys_protected',