From c3c78f609f2fc0189fd8eb27dc9b16f95e645cc0 Mon Sep 17 00:00:00 2001
From: efiacor <fiachra.corcoran@est.tech>
Date: Thu, 11 Aug 2022 09:09:01 +0100
Subject: [PATCH] [OOM] Upgrade oom versions

Change-Id: I79c7bdca4c7b683d74e10afed84395649a233a9f
Signed-off-by: efiacor <fiachra.corcoran@est.tech>
Issue-ID: OOM-3018
---
 jjb/oom/oom-helm.yaml      |  1 +
 packer/provision/helm.yaml | 37 ++++++++++++++++++++++++++++++++++++-
 shell/helm-repo-init.sh    |  2 +-
 3 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/jjb/oom/oom-helm.yaml b/jjb/oom/oom-helm.yaml
index 6491437b2..0d896a2b2 100644
--- a/jjb/oom/oom-helm.yaml
+++ b/jjb/oom/oom-helm.yaml
@@ -32,6 +32,7 @@
 
     helm_bin:
       - helm3.6
+      - helm3.8
 
     exclude: []
     subproject: []
diff --git a/packer/provision/helm.yaml b/packer/provision/helm.yaml
index 2ab517f7d..d3ab71bbd 100644
--- a/packer/provision/helm.yaml
+++ b/packer/provision/helm.yaml
@@ -6,8 +6,9 @@
   become_method: sudo
 
   vars:
-    kubectl_version: 1.19.11
+    kubectl_version: 1.23.7
     helm3_6_version: 3.6.3
+    helm3_8_version: 3.8.2
     chartmuseum_version: 0.12.0
 
   tasks:
@@ -51,6 +52,40 @@
              which helm3.6
           become: true
 
+    - name: 'Install Helm3.8 {{helm3_8_version}}'
+      block:
+        - name: 'Create directory /tmp/helm3.8'
+          file:
+            path: /tmp/helm3.8
+            state: directory
+        - name: 'Fetch tar.gz for Helm 3.8'
+          get_url:
+            url: "https://get.helm.sh/helm-v{{helm3_8_version}}-linux-amd64.tar.gz"
+            dest: /tmp/helm3.8
+        - name: 'Unarchive Helm 3.8'
+          unarchive:
+            src: "/tmp/helm3.8/helm-v{{helm3_8_version}}-linux-amd64.tar.gz"
+            dest: /tmp/helm3.8
+            remote_src: true
+          become: yes
+        - name: 'Move Helm 3.8 bin to /usr/local/bin and set as executable'
+          command: 'mv /tmp/helm3.8/linux-amd64/helm /usr/local/bin/helm3.8'
+          become: yes
+        - name: 'Check Helm 3.8'
+          command: 'which helm3.8'
+        - name: 'Check kubectl {{kubectl_version}}'
+          command: 'which kubectl'
+
+        - name: 'Install Helm 3.8'
+          shell: |
+             echo "----> Installing helm3.8"
+             wget 'https://get.helm.sh/helm-v{{helm3_8_version}}-linux-amd64.tar.gz'
+             tar -xvf 'https://get.helm.sh/helm-v{{helm3_8_version}}-linux-amd64.tar.gz'
+             mv linux-amd64/helm /usr/local/bin/helm3.8
+             which helm3.8
+          become: true
+
+
     - name: 'Install ChartMuseum {{chartmuseum_version}}'
       block:
         - name: 'Fetch bin for ChartMuseum'
diff --git a/shell/helm-repo-init.sh b/shell/helm-repo-init.sh
index 5aecc8e33..3228aa37e 100755
--- a/shell/helm-repo-init.sh
+++ b/shell/helm-repo-init.sh
@@ -6,6 +6,6 @@ mkdir -p ".chartstorage"
 
 chartmuseum --port=6464 --storage="local" --storage-local-rootdir=".chartstorage" &> /dev/null &
 source helm.prop
-$HELM_BIN plugin install --version v0.9.0 https://github.com/chartmuseum/helm-push.git || true
+$HELM_BIN plugin install --version v0.10.2 https://github.com/chartmuseum/helm-push.git || true
 $HELM_BIN repo add local http://localhost:6464
 $HELM_BIN repo add onap http://localhost:6464
-- 
2.16.6