X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=bin%2Fdeploy-nonrtric;h=887c04eebf83b76e97243acd369a5f9f60e98707;hb=refs%2Fchanges%2F35%2F5935%2F6;hp=eab4dc21b349fae6380446d6166fdc07a4a6fcc2;hpb=4d2d4f1134dfe309238af3777fbefa91c1ecf8d6;p=it%2Fdep.git

diff --git a/bin/deploy-nonrtric b/bin/deploy-nonrtric
index eab4dc21..887c04ee 100755
--- a/bin/deploy-nonrtric
+++ b/bin/deploy-nonrtric
@@ -17,6 +17,8 @@
 
 # This script deploys NonRtRic components automatically
 
+
+
 if [ "$#" -eq 1 ]; then
     OVERRIDEYAML=$1
 else
@@ -27,7 +29,7 @@ else
 
         -f) OVERRIDEYAML=$2
             shift
-            ;;
+            ;; 
         *) echo "Option $1 not recognized" ;; # In case you typed a different option other than a,b,c
 
         esac
@@ -50,30 +52,77 @@ fi
 
 ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
 
+echo "** $ROOT_DIR"
+rm $ROOT_DIR/../nonrtric/helm/*/charts/*.tgz
+
+
+#Check for helm3
+IS_HELM3=$(helm version -c --short|grep -e "^v3")
+
+if [ $IS_HELM3 ]
+then
+  # Check for servcm plugin
+  helm plugin list | grep -q "^servecm"
+  if [ $? -eq "1" ]
+  then
+    helm plugin install https://github.com/jdolitsky/helm-servecm
+  fi
+fi
+
 # Start Helm local repo if there isn't one
 HELM_REPO_PID=$(ps -x | grep  "helm serve" | grep -v "grep" | awk '{print $1}')
 if [ -z "$HELM_REPO_PID" ]; then
-    nohup helm serve >& /dev/null &
+    if [ -z $IS_HELM3 ]
+    then
+      nohup helm serve >& /dev/null &
+    else
+      echo EUID:$EUID
+      if [ $EUID -ne "0" ]
+         then
+           echo "Error: Please run the command with sudo as helm servecm needs to copy a file in location needing privilege"
+           exit;
+         fi
+      eval $(helm env |grep HELM_REPOSITORY_CACHE)
+      echo yes > /tmp/ric-yes
+      nohup sudo sh -c "helm servecm --port=8879 --context-path=/charts  --storage local --storage-local-rootdir $HELM_REPOSITORY_CACHE/local/  < /tmp/ric-yes " &
+    fi
+fi
+
+
+# Package common templates and serve it using Helm local repo
+HELM_LOCAL_REPO=""
+if [ $IS_HELM3 ]
+then
+  eval $(helm env |grep HELM_REPOSITORY_CACHE)
+  HELM_LOCAL_REPO="${HELM_REPOSITORY_CACHE}/local/"
+else
+  HELM_HOME=$(helm home)
+  HELM_LOCAL_REPO="${HELM_HOME}/repository/local/"
 fi
 
-$ROOT_DIR/prepare-common-templates
 
-COMPONENTS=${LIST_OF_COMPONENTS:-"controlpanel a1controller a1simulator policymanagementservice"}
-echo "Packaging NONRTRIC components [$COMPONENTS]"
+rm $HELM_LOCAL_REPO/*
 
+helm repo remove local
+$ROOT_DIR/prepare-common-templates
+
+COMPONENTS="controlpanel a1controller a1simulator policymanagementservice enrichmentservice rappcatalogueservice nonrtricgateway"
 for component in $COMPONENTS; do
+    echo "Packaging NONRTRIC component [$component]"
     helm dep up $ROOT_DIR/../nonrtric/helm/$component
     VERSION=$(cat $ROOT_DIR/../nonrtric/helm/$component/Chart.yaml | grep version | awk '{print $2}')
     helm package -d /tmp $ROOT_DIR/../nonrtric/helm/$component
-    cp /tmp/$component-$VERSION.tgz $HELM_HOME/repository/local/
+    cp /tmp/$component-$VERSION.tgz ${HELM_LOCAL_REPO}
 done
 
-helm repo index $HELM_HOME/repository/local/
+helm dep up $ROOT_DIR/../nonrtric/helm/nonrtric
+
+helm repo index ${HELM_LOCAL_REPO}
 
 # Make sure that helm local repo is added
-helm repo remove local
-helm repo add local http://127.0.0.1:8879/charts
+helm repo add local http://127.0.0.1:8879/charts --force-update
 
 echo "Finished Packaging NONRTRIC components [$COMPONENTS]"
 
+
 $ROOT_DIR/../nonrtric/bin/install -f $OVERRIDEYAML