X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=nonrtric%2Fbin%2Finstall;h=608556dfb05cc070e7d2e121ef157a6f905bbca6;hb=07123460d813193fb0fdcc6d69230397b4467f56;hp=56376faa012ccc3fffd85be0067735d0838d2977;hpb=ce3241c91902cd029c256d4ac9a3d0c80cbb0211;p=it%2Fdep.git

diff --git a/nonrtric/bin/install b/nonrtric/bin/install
index 56376faa..608556df 100755
--- a/nonrtric/bin/install
+++ b/nonrtric/bin/install
@@ -15,7 +15,7 @@
 #   limitations under the License.                                             #
 ################################################################################
 
-
+IS_HELM3=$(helm version -c --short|grep -e "^v3")
 while [ -n "$1" ]; do # while loop starts
 
     case "$1" in
@@ -51,10 +51,9 @@ COMMON_BLOCK=$(cat $OVERRIDEYAML | awk '/^common:/{getline; while ($0 ~ /^ +.*|^
 NAMESPACE_BLOCK=$(cat $OVERRIDEYAML | awk '/^  namespace:/{getline; while ($0 ~ /^    .*|^ *$/) {print $0; if (getline == 0) {break}}}')
 NONRTRIC_NAMESPACE=$(echo "$NAMESPACE_BLOCK" | awk '/^ *nonrtric:/{print $2}')
 RELEASE_PREFIX=$(echo "$COMMON_BLOCK" | awk '/^ *releasePrefix:/{print $2}')
-SIMULATOR_BLOCK=$(cat $OVERRIDEYAML | awk '/^  simulatorinstance:/{getline; while ($0 ~ /^ +.*|^ *$/) {print $0; if (getline == 0) {break}}}')
-SIMULATOR_COUNT=$(echo "$SIMULATOR_BLOCK" | awk '/^ *count:/{print $2}')
-COMPONENTS=${LIST_OF_COMPONENTS:-"a1simulator policymanagementservice"}
-echo "SIMULATOR_COUNT [$SIMULATOR_COUNT]"
+PARENT_CHART=$(cat $OVERRIDEYAML | awk '/^ *component:/{print $2}')
+COMPONENTS=${LIST_OF_COMPONENTS:-"controlpanel a1controller a1simulator policymanagementservice enrichmentservice nonrtric rappcatalogueservice nonrtricgateway"}
+echo "Chart name- $PARENT_CHART"
 
 if ! kubectl get ns ${NONRTRIC_NAMESPACE:-nonrtric}> /dev/null 2>&1; then
     kubectl create ns ${NONRTRIC_NAMESPACE:-nonrtric}
@@ -67,18 +66,13 @@ kubectl create configmap -n ${NONRTRIC_NAMESPACE:-nonrtric} nonrtric-recipe --fr
 
 echo "Deploying NONRTRIC components [$COMPONENTS]"
 
-for component in $COMPONENTS; do
-    helm dep up $DIR/../helm/$component
-    case "$component" in
-            a1simulator)
-		for((i=1;i<=$SIMULATOR_COUNT;i++)) ; do
-                    echo "CREATING SIMUALATOR INSTANCE $i"
-		    helm install -f $OVERRIDEYAML --namespace "${NONRTRIC_NAMESPACE:-nonrtric}" --name "${RELEASE_PREFIX}-$component-$i" --set a1simulator.instanceName=a1-sim-$i $DIR/../helm/$component
-                done
-	    ;;
-            *)
-                helm install -f $OVERRIDEYAML --namespace "${NONRTRIC_NAMESPACE:-nonrtric}" --name "${RELEASE_PREFIX}-$component" $DIR/../helm/$component
+echo "Updating the Parent Chart [$PARENT_CHART]"
+helm dep up $DIR/../helm/$PARENT_CHART
 
-    esac
+HELM_NAME_OPT=""
+if [ -z $IS_HELM3 ];then
+   HELM_NAME_OPT="--name"
+fi
+
+helm install -f $OVERRIDEYAML --namespace "${NONRTRIC_NAMESPACE:-nonrtric}" ${HELM_NAME_OPT} "${RELEASE_PREFIX}" $DIR/../helm/"${PARENT_CHART}"
 
-done