X-Git-Url: https://gerrit.nordix.org/gitweb?p=infra%2Fstack%2Fkubernetes.git;a=blobdiff_plain;f=playbooks%2Froles%2Fpackage%2Ftasks%2Fcontainers.yaml;h=c90f906a030ef73e6bad0b434019125ca80420de;hp=91019504c537adf2c36db41721084b01f2ef4641;hb=df6ea7a608badaa4f78783bc0ac6184ce484e522;hpb=20d34e772e021fabdee0aa9b50e9804a80d5108a

diff --git a/playbooks/roles/package/tasks/containers.yaml b/playbooks/roles/package/tasks/containers.yaml
index 9101950..c90f906 100644
--- a/playbooks/roles/package/tasks/containers.yaml
+++ b/playbooks/roles/package/tasks/containers.yaml
@@ -90,11 +90,18 @@
   become: true
   changed_when: false
 
+- name: Pull tiller container image (helm v2 only)
+  command: "docker pull {{ downloads['tiller'].repo }}:{{ downloads['tiller'].tag }}"
+  become: true
+  changed_when: false
+  when: helm_version is version('v3.0.0', '<')
+
 - name: Pull misc container images
   command: "docker pull {{ downloads[item].repo }}:{{ downloads[item].tag }}"
   loop: "{{ k8s_misc_images }}"
   become: true
   changed_when: false
+  when: downloads[item].container is defined and downloads[item].container
 
 - name: Pull other container images
   command: "docker pull {{ other_images[item.key].repo }}:{{ other_images[item.key].tag }}"
@@ -122,6 +129,17 @@
     chdir: "{{ containers_folder }}"
   become: true
   changed_when: false
+  when: downloads[item].container is defined and downloads[item].container
+
+- name: Save tiller container image (helm v2 only)
+  command: |-
+    docker save {{ downloads['tiller'].repo }}:{{ downloads['tiller'].tag }}
+    -o {{ downloads['tiller'].repo }} -o {{ downloads['tiller'].repo | replace('/', '_') }}_{{ downloads['tiller'].tag }}.tar
+  args:
+    chdir: "{{ containers_folder }}"
+  become: true
+  changed_when: false
+  when: helm_version is version('v3.0.0', '<')
 
 - name: Save other container images
   command: |-