From 8a35cba25c89e92b055b5b5207fd6f2ef43516f4 Mon Sep 17 00:00:00 2001
From: Bharat Kunwar <bharat@stackhpc.com>
Date: Wed, 22 Apr 2020 21:07:58 +0000
Subject: [PATCH] [k8s] Build helm-client containers v2.16.6 and v3.2.0

Use buster-slim base image which is the latest stable [0].

[0] https://www.debian.org/releases/index.en.html

Story: 2007514
Task: 39525

Change-Id: I1ff8224cf064b7138f8868b2ac17710014f1e988
---
 dockerfiles/helm-client/Dockerfile    | 6 +++---
 playbooks/container-builder-vars.yaml | 4 +++-
 playbooks/container-builder.yaml      | 5 +++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/dockerfiles/helm-client/Dockerfile b/dockerfiles/helm-client/Dockerfile
index 84b73a2472..2f5c4402ee 100644
--- a/dockerfiles/helm-client/Dockerfile
+++ b/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 \
diff --git a/playbooks/container-builder-vars.yaml b/playbooks/container-builder-vars.yaml
index e427578bd6..ab1f26a758 100644
--- a/playbooks/container-builder-vars.yaml
+++ b/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.15.2
diff --git a/playbooks/container-builder.yaml b/playbooks/container-builder.yaml
index 27c972b22c..c0687c08e3 100644
--- a/playbooks/container-builder.yaml
+++ b/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"