Merge "[k8s] Build helm-client containers v2.16.6 and v3.2.0"

dockerfiles/helm-client/Dockerfile

@@ -1,5 +1,5 @@
-ARG HELM_VERSION=v2.12.0
-FROM debian:sid-slim
+ARG HELM_VERSION=v3.2.0
+FROM debian:buster-slim
 
 ARG HELM_VERSION
 
@@ -7,7 +7,7 @@ RUN apt-get update \
     && apt-get install -y \
         curl \
         bash \
-    && curl -o helm.tar.gz https://storage.googleapis.com/kubernetes-helm/helm-${HELM_VERSION}-linux-amd64.tar.gz \
+    && curl -o helm.tar.gz https://get.helm.sh/helm-${HELM_VERSION}-linux-amd64.tar.gz \
     && mkdir -p helm \
     && tar zxvf helm.tar.gz -C helm \
     && cp helm/linux-amd64/helm /usr/local/bin \

playbooks/container-builder-vars.yaml

@@ -18,7 +18,9 @@ magnum_images:
   - name: heat-container-agent
     tag: ussuri-dev
 
-helm_version: v2.12.3
+helm_versions:
+  - version: v2.16.6
+  - version: v3.2.0
 
 cluster_autoscaler_versions:
   - version: 1.16.5

playbooks/container-builder.yaml

@@ -100,10 +100,11 @@
         - docker_image:
             path: "{{ magnum_src_dir }}/dockerfiles/helm-client"
             name: "{{ magnum_repository }}/helm-client"
-            tag: "{{ helm_version }}"
+            tag: "{{ item.version }}"
             buildargs:
-              HELM_VERSION: "{{ helm_version }}"
+              HELM_VERSION: "{{ item.version }}"
             push: no
+          with_items: "{{ helm_versions }}"
           retries: 10
 
     - name: "Build cluster-autoscaler image"