From 6a33411d65eac3e97fffa0e587408546ef847abf Mon Sep 17 00:00:00 2001
From: Maxime Guyot <Miouge1@users.noreply.github.com>
Date: Mon, 11 Feb 2019 23:32:26 +0100
Subject: [PATCH] Add an option for helm init --wait (#4202)
---
roles/kubernetes-apps/helm/defaults/main.yml | 3 +++
roles/kubernetes-apps/helm/tasks/main.yml | 2 ++
2 files changed, 5 insertions(+)
diff --git a/roles/kubernetes-apps/helm/defaults/main.yml b/roles/kubernetes-apps/helm/defaults/main.yml
index 5c6396b57..1042b985c 100644
--- a/roles/kubernetes-apps/helm/defaults/main.yml
+++ b/roles/kubernetes-apps/helm/defaults/main.yml
@@ -7,6 +7,9 @@ helm_home_dir: "/root/.helm"
# Deployment mode: host or docker
helm_deployment_type: host
+# Wait until Tiller is running and ready to receive requests
+tiller_wait: false
+
# Do not download the local repository cache on helm init
helm_skip_refresh: false
diff --git a/roles/kubernetes-apps/helm/tasks/main.yml b/roles/kubernetes-apps/helm/tasks/main.yml
index 40476b0bf..6023bf90a 100644
--- a/roles/kubernetes-apps/helm/tasks/main.yml
+++ b/roles/kubernetes-apps/helm/tasks/main.yml
@@ -50,6 +50,7 @@
{% if tiller_max_history is defined %} --history-max={{ tiller_max_history }}{% endif %}
{% if tiller_enable_tls %} --tiller-tls --tiller-tls-verify --tiller-tls-cert={{ tiller_tls_cert }} --tiller-tls-key={{ tiller_tls_key }} --tls-ca-cert={{ tiller_tls_ca_cert }} {% endif %}
{% if tiller_secure_release_info %} --override 'spec.template.spec.containers[0].command'='{/tiller,--storage=secret}' {% endif %}
+ {% if tiller_wait %} --wait{% endif %}
{% else %}
--client-only
{% endif %}
@@ -70,6 +71,7 @@
{% if tiller_max_history is defined %} --history-max={{ tiller_max_history }}{% endif %}
{% if tiller_enable_tls %} --tiller-tls --tiller-tls-verify --tiller-tls-cert={{ tiller_tls_cert }} --tiller-tls-key={{ tiller_tls_key }} --tls-ca-cert={{ tiller_tls_ca_cert }} {% endif %}
{% if tiller_secure_release_info %} --override 'spec.template.spec.containers[0].command'='{/tiller,--storage=secret}' {% endif %}
+ {% if tiller_wait %} --wait{% endif %}
--output yaml
| {{bin_dir}}/kubectl apply -f -
changed_when: false
--
GitLab