X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=bin%2Fdeploy-nonrtric;h=54d0dba05169d6d06231788cba7e57d6c02bea3f;hb=c96a76b9867c4650c5f0dce302909235a4389a05;hp=c05bc72c27424d532c99d9cabc193f9173e65c99;hpb=16d1788c8835feb3bf819711704cb63a2116c829;p=it%2Fdep.git

diff --git a/bin/deploy-nonrtric b/bin/deploy-nonrtric
index c05bc72c..54d0dba0 100755
--- a/bin/deploy-nonrtric
+++ b/bin/deploy-nonrtric
@@ -50,25 +50,62 @@ fi
 
 ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
 
+#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
 
+
 $ROOT_DIR/prepare-common-templates
 
 COMPONENTS=${LIST_OF_COMPONENTS:-"controlpanel a1controller a1simulator policymanagementservice enrichmentservice"}
 echo "Packaging NONRTRIC components [$COMPONENTS]"
+# 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
 
 for component in $COMPONENTS; do
     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 repo index ${HELM_LOCAL_REPO}
 
 # Make sure that helm local repo is added
 helm repo remove local