Add Helm 3.x support (#5441)

* Add Helm 3.x support

* tiller enabled when helm < 3.0.0
This commit is contained in:
Bort Verwilst
2019-12-12 18:24:32 +01:00
committed by Kubernetes Prow Robot
parent f0f8379e1b
commit db2ca014cb
4 changed files with 18 additions and 3 deletions

View File

@@ -364,7 +364,7 @@ test_image_repo: "{{ docker_image_repo }}/library/busybox"
test_image_tag: latest
busybox_image_repo: "{{ docker_image_repo }}/library/busybox"
busybox_image_tag: 1.29.2
helm_version: "v2.16.0"
helm_version: "v2.16.1"
helm_image_repo: "{{ docker_image_repo }}/lachlanevenson/k8s-helm"
helm_image_tag: "{{ helm_version }}"
tiller_image_repo: "{{ gcr_image_repo }}/kubernetes-helm/tiller"
@@ -793,7 +793,7 @@ downloads:
- kube-node
tiller:
enabled: "{{ helm_enabled }}"
enabled: "{{ helm_enabled and helm_version is version('v3.0.0', '<') }}"
container: true
repo: "{{ tiller_image_repo }}"
tag: "{{ tiller_image_tag }}"

View File

@@ -17,6 +17,7 @@
when:
- dns_mode != 'none'
- inventory_hostname == groups['kube-master'][0]
- helm_version is version('v3.0.0', '<')
- name: Helm | Apply Helm Manifests (RBAC)
kube:
@@ -30,11 +31,14 @@
when:
- dns_mode != 'none'
- inventory_hostname == groups['kube-master'][0]
- helm_version is version('v3.0.0', '<')
# Generate necessary certs for securing Helm and Tiller connection with TLS
- name: Helm | Set up TLS
include_tasks: "gen_helm_tiller_certs.yml"
when: tiller_enable_tls
when:
- tiller_enable_tls
- helm_version is version('v3.0.0', '<')
- name: Helm | Install client on all masters
command: >
@@ -44,6 +48,8 @@
--client-only
environment: "{{ proxy_env }}"
changed_when: false
when:
- helm_version is version('v3.0.0', '<')
# FIXME: https://github.com/helm/helm/issues/6374
- name: Helm | Install/upgrade helm
@@ -67,6 +73,7 @@
register: install_helm
when:
- inventory_hostname == groups['kube-master'][0]
- helm_version is version('v3.0.0', '<')
changed_when: false
environment: "{{ proxy_env }}"
@@ -91,6 +98,7 @@
changed_when: false
when:
- inventory_hostname == groups['kube-master'][0]
- helm_version is version('v3.0.0', '<')
environment: "{{ proxy_env }}"
- name: Make sure bash_completion.d folder exists