From: Fiachra Corcoran <fiachra.corcoran@est.tech>
Date: Thu, 5 May 2022 14:35:04 +0000 (+0000)
Subject: Merge "[POLICY] Upgrade image versions"
X-Git-Tag: 10.0.0~15
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=03d35322f9163ff7c956eefb964001ab8946d6b7;hp=2a5d1bbf59b2ec3abc2d61fdaf85e801cbaf3d7d;p=oom.git

Merge "[POLICY] Upgrade image versions"
---

diff --git a/kubernetes/helm/plugins/deploy/deploy.sh b/kubernetes/helm/plugins/deploy/deploy.sh
index 36853baa1f..858a5e0b7d 100755
--- a/kubernetes/helm/plugins/deploy/deploy.sh
+++ b/kubernetes/helm/plugins/deploy/deploy.sh
@@ -284,14 +284,19 @@ deploy() {
       if [ $SUBCHART_ENABLED -eq 1 ]; then
         deploy_subchart
       else
-        array=($(echo "$ALL_HELM_RELEASES" | grep "${RELEASE}-${subchart}"))
-        n=${#array[*]}
-        for i in $(seq $(($n-1)) -1 0); do
-          helm del "${array[i]}"
+        reverse_list=
+        for item in $(echo "$ALL_HELM_RELEASES" | grep "${RELEASE}-${subchart}")
+        do
+          reverse_list="$item $reverse_list"
+        done
+        for item in $reverse_list
+        do
+          helm del $item
         done
       fi
     done
 
+
     for subchart in * ; do
       SUBCHART_OVERRIDES=$CACHE_SUBCHART_DIR/$subchart/subchart-overrides.yaml
 
@@ -306,10 +311,14 @@ deploy() {
       if [ $SUBCHART_ENABLED -eq 1 ]; then
         deploy_subchart
       else
-        array=($(echo "$ALL_HELM_RELEASES" | grep "${RELEASE}-${subchart}"))
-        n=${#array[*]}
-        for i in $(seq $(($n-1)) -1 0); do
-          helm del "${array[i]}"
+        reverse_list=
+        for item in $(echo "$ALL_HELM_RELEASES" | grep "${RELEASE}-${subchart}")
+        do
+          reverse_list="$item $reverse_list"
+        done
+        for item in $reverse_list
+        do
+          helm del $item
         done
       fi
     done
diff --git a/kubernetes/strimzi/templates/strimzi-kafka.yaml b/kubernetes/strimzi/templates/strimzi-kafka.yaml
index 06802da968..58193e33aa 100644
--- a/kubernetes/strimzi/templates/strimzi-kafka.yaml
+++ b/kubernetes/strimzi/templates/strimzi-kafka.yaml
@@ -73,7 +73,6 @@ spec:
       inter.broker.protocol.version: "3.0"
     storage:
       type: jbod
-      class: {{ include "common.storageClass" (dict "dot" . "suffix" "kafka" "persistenceInfos" .Values.persistenceKafka) }}
       volumes:
       - id: 0
         type: persistent-claim