X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fhelm%2Fplugins%2Fdeploy%2Fdeploy.sh;h=a8d134ba92c36eb34c459c7ffb99dac9cfc870dc;hb=20d6797d16645fdec94b330283860185d24d916e;hp=36853baa1f17d03ec1f5472c4e2738c9a850f0f0;hpb=d0157eff4bd792c544a33fcad86b572d3a48627a;p=oom.git

diff --git a/kubernetes/helm/plugins/deploy/deploy.sh b/kubernetes/helm/plugins/deploy/deploy.sh
index 36853baa1f..a8d134ba92 100755
--- a/kubernetes/helm/plugins/deploy/deploy.sh
+++ b/kubernetes/helm/plugins/deploy/deploy.sh
@@ -93,8 +93,9 @@ resolve_deploy_flags() {
 check_for_dep() {
     try=0
     retries=60
-    until (kubectl get deployment -n $HELM_NAMESPACE | grep -P "\b$1\b") &>/dev/null; do
-        (( ++try > retries )) && exit 1
+    until (kubectl get deployment -n $HELM_NAMESPACE | grep -P "\b$1\b") >/dev/null 2>&1; do
+        try=$(($try + 1))
+        [ $try -gt $retries ] && exit 1
         echo "$1 not found. Retry $try/$retries"
         sleep 10
     done
@@ -284,14 +285,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 +312,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