From f041cace7400db4e7aadc4c34d7eff4cecbf6f27 Mon Sep 17 00:00:00 2001 From: Lathish Date: Mon, 21 Jun 2021 12:49:43 +0100 Subject: [PATCH] Install Kong in nonrtric namespace Issue-ID: NONRTRIC-527 Change-Id: Ie2204876c58b421e5cc8cacd79411a6a3753b0db Signed-off-by: Lathish --- bin/deploy-nonrtric | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/bin/deploy-nonrtric b/bin/deploy-nonrtric index 6770ad24..02846c67 100755 --- 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" -- 2.16.6