Install Kong in nonrtric namespace

Issue-ID: NONRTRIC-527
Change-Id: Ie2204876c58b421e5cc8cacd79411a6a3753b0db
Signed-off-by: Lathish <lathishbabu.ganesan@est.tech>

diff --git a/bin/deploy-nonrtric b/bin/deploy-nonrtric
index 6770ad2..02846c6 100755 (executable)
--- a/bin/deploy-nonrtric
+++ b/bin/deploy-nonrtric
@@ -132,14 +132,6 @@ NONRTRIC_NAMESPACE=$(echo "$NAMESPACE_BLOCK" | awk '/^ *nonrtric:/{print $2}')
 RELEASE_PREFIX=$(echo "$COMMON_BLOCK" | awk '/^ *releasePrefix:/{print $2}')
 INSTALL_KONG=$(cat $OVERRIDEYAML | awk '/^  installKong:/{print $2}')
 echo "Chart name- $PARENT_CHART"
-echo "Install Kong- $INSTALL_KONG"
-
-if [ "$INSTALL_KONG" = true ];then
-   echo "Installing Kong"
-   helm repo add kong https://charts.konghq.com
-   helm repo update
-   helm install kong-nonrtric --namespace kong kong/kong --set ingressController.installCRDs=false --set admin.enabled=true
-fi
 
 if ! kubectl get ns ${NONRTRIC_NAMESPACE:-nonrtric}> /dev/null 2>&1; then
     kubectl create ns ${NONRTRIC_NAMESPACE:-nonrtric}
@@ -148,6 +140,15 @@ if ! kubectl get ns onap > /dev/null 2>&1; then
     kubectl create ns onap
 fi
 
+echo "Install Kong- $INSTALL_KONG"
+
+if [ "$INSTALL_KONG" = true ];then
+   echo "Installing Kong"
+   helm repo add kong https://charts.konghq.com --force-update
+   helm repo update
+   helm install kong-nonrtric --namespace ${NONRTRIC_NAMESPACE:-nonrtric} kong/kong --set ingressController.installCRDs=false --set admin.enabled=true
+fi
+
 kubectl create configmap -n ${NONRTRIC_NAMESPACE:-nonrtric} nonrtric-recipe --from-file=recipe=$OVERRIDEYAML
 
 echo "Deploying NONRTRIC"