C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

install helm client separately (#5212)

Browse source
This commit is contained in:
Erwan Miran 2019-10-04 14:14:02 +02:00 committed by Kubernetes Prow Robot
parent 89f1223f64
commit 0ba336b04e
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
roles/kubernetes-apps/helm/tasks/main.yml
View file

@ -36,13 +36,21 @@
include_tasks: "gen_helm_tiller_certs.yml" include_tasks: "gen_helm_tiller_certs.yml"
when: tiller_enable_tls when: tiller_enable_tls
- name: Helm | Install client on all masters
command: >
{{ bin_dir }}/helm init --tiller-namespace={{ tiller_namespace }}
{% if helm_skip_refresh %} --skip-refresh{% endif %}
{% if helm_stable_repo_url is defined %} --stable-repo-url {{ helm_stable_repo_url }}{% endif %}
--client-only
environment: "{{ proxy_env }}"
changed_when: false
# FIXME: https://github.com/helm/helm/issues/6374 # FIXME: https://github.com/helm/helm/issues/6374
- name: Helm | Install/upgrade helm - name: Helm | Install/upgrade helm
shell: > shell: >
{{ bin_dir }}/helm init --tiller-namespace={{ tiller_namespace }} {{ bin_dir }}/helm init --tiller-namespace={{ tiller_namespace }}
{% if helm_skip_refresh %} --skip-refresh{% endif %} {% if helm_skip_refresh %} --skip-refresh{% endif %}
{% if helm_stable_repo_url is defined %} --stable-repo-url {{ helm_stable_repo_url }}{% endif %} {% if helm_stable_repo_url is defined %} --stable-repo-url {{ helm_stable_repo_url }}{% endif %}
{% if inventory_hostname == groups['kube-master'][0] %}
--upgrade --tiller-image={{ tiller_image_repo }}:{{ tiller_image_tag }} --upgrade --tiller-image={{ tiller_image_repo }}:{{ tiller_image_tag }}
{% if rbac_enabled %} --service-account=tiller{% endif %} {% if rbac_enabled %} --service-account=tiller{% endif %}
{% if tiller_node_selectors is defined %} --node-selectors {{ tiller_node_selectors }}{% endif %} {% if tiller_node_selectors is defined %} --node-selectors {{ tiller_node_selectors }}{% endif %}
@ -56,10 +64,9 @@
--output yaml --output yaml
| sed 's@apiVersion: extensions/v1beta1@apiVersion: apps/v1@' | sed 's@apiVersion: extensions/v1beta1@apiVersion: apps/v1@'
| {{ bin_dir }}/kubectl apply -f - | {{ bin_dir }}/kubectl apply -f -
{% else %}
--client-only
{% endif %}
register: install_helm register: install_helm
when:
- inventory_hostname == groups['kube-master'][0]
changed_when: false changed_when: false
environment: "{{ proxy_env }}" environment: "{{ proxy_env }}"