X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=bin%2Fdeploy-ric-platform;h=bce372682a09a6165be3b38b625af7e34d6866e6;hb=07123460d813193fb0fdcc6d69230397b4467f56;hp=1d2f837b7470d9a6c0e0d48410e76ca4709fa413;hpb=dc00cdf008775e2ac5dddb186d1eb81e80370b69;p=it%2Fdep.git

diff --git a/bin/deploy-ric-platform b/bin/deploy-ric-platform
index 1d2f837b..bce37268 100755
--- a/bin/deploy-ric-platform
+++ b/bin/deploy-ric-platform
@@ -51,26 +51,39 @@ 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
 
-# Package ric-common and serve it using Helm local repo
-HELM_HOME=$(helm home)
-COMMON_CHART_VERSION=$(cat $ROOT_DIR/../ric-common/Common-Template/helm/ric-common/Chart.yaml | grep version | awk '{print $2}')
-helm package -d /tmp $ROOT_DIR/../ric-common/Common-Template/helm/ric-common
-cp /tmp/ric-common-$COMMON_CHART_VERSION.tgz $HELM_HOME/repository/local/
-helm repo index $HELM_HOME/repository/local/
-
-
-# Make sure that helm local repo is added
-helm repo remove local
-helm repo add local http://127.0.0.1:8879/charts
-
-
+$ROOT_DIR/prepare-common-templates
 
 $ROOT_DIR/../ric-dep/bin/install -f $OVERRIDEYAML