From: guillaume.lambert <guillaume.lambert@orange.com>
Date: Wed, 4 May 2022 07:44:44 +0000 (+0200)
Subject: [COMMON] Fix some k8s plug deploy.sh bashisms
X-Git-Tag: 10.0.0~12^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=oom.git;a=commitdiff_plain;h=20d6797d16645fdec94b330283860185d24d916e

[COMMON] Fix some k8s plug deploy.sh bashisms

These bashisms were added recently with a few fixes.

Issue-ID: OOM-2643
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I33b77a1db871d6628187692e260265d9c754103f
---

diff --git a/kubernetes/helm/plugins/deploy/deploy.sh b/kubernetes/helm/plugins/deploy/deploy.sh
index 858a5e0b7d..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