Add a flag to disable tiller instalation
Change-Id: Ibfca33595a601b09daf5d9741fbb161672946a8f
diff --git a/helm/client.sls b/helm/client.sls
index 0d0678c..f997020 100644
--- a/helm/client.sls
+++ b/helm/client.sls
@@ -46,6 +46,7 @@
- require:
- file: /usr/bin/helm
+{%- if client.tiller.install %}
install_tiller:
cmd.run:
- name: helm init --upgrade
@@ -62,6 +63,7 @@
- HELM_HOME: {{ helm_home }}
- onchanges:
- cmd: install_tiller
+{%- endif %}
{%- for repo_name, repo_url in client.repos.items() %}
ensure_{{ repo_name }}_repo:
@@ -92,7 +94,9 @@
{{ release['values']|yaml(False)|indent(8) }}
{%- endif %}
- require:
+{%- if client.tiller.install %}
- cmd: wait_for_tiller
+{%- endif %}
- cmd: ensure_{{ namespace }}_namespace
{%- do namespaces.append(namespace) %}
{%- else %}{# not release.enabled #}
@@ -100,6 +104,11 @@
helm_release.absent:
- name: {{ release_name }}
- namespace: {{ namespace }}
+ - require:
+{%- if client.tiller.install %}
+ - cmd: wait_for_tiller
+{%- endif %}
+ - cmd: prepare_client
{%- endif %}{# release.enabled #}
{%- endfor %}{# release_id, release in client.releases #}
diff --git a/metadata/service/client.yml b/metadata/service/client.yml
index 01fe21a..6782c36 100644
--- a/metadata/service/client.yml
+++ b/metadata/service/client.yml
@@ -9,5 +9,7 @@
version: 2.4.2
download_url: https://storage.googleapis.com/kubernetes-helm/helm-v${helm:client:version}-linux-amd64.tar.gz
download_hash: sha256=96f74ff04ec7eb38e5f53aba73132bfe4d6b81168f20574dad25a9bcaceec81b
+ tiller:
+ install: true
repos: {}
releases: {}