Merge "[HV-VES-STRIMZI] Migrate hv-ves to use strimzi kafka"

diff --git a/kubernetes/dcaegen2-services/components/dcae-slice-analysis-ms/values.yaml b/kubernetes/dcaegen2-services/components/dcae-slice-analysis-ms/values.yaml
index ef272ee..c797050 100644 (file)
--- a/kubernetes/dcaegen2-services/components/dcae-slice-analysis-ms/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-slice-analysis-ms/values.yaml
@@ -58,7 +58,7 @@ tlsImage: onap/org.onap.dcaegen2.deployments.tls-init-container:2.1.0
 # Application Configuration Defaults.
 #################################################################
 # Application Image
-image: onap/org.onap.dcaegen2.services.components.slice-analysis-ms:1.1.1
+image: onap/org.onap.dcaegen2.services.components.slice-analysis-ms:1.1.2
 
 # Log directory where logging sidecar should look for log files
 # if path is set to null sidecar won't be deployed in spite of

diff --git a/kubernetes/helm/plugins/deploy/deploy.sh b/kubernetes/helm/plugins/deploy/deploy.sh
index 858a5e0..a8d134b 100755 (executable)
--- 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