Merge "Enabling helm3 & kubernetes 1.18 for RIC"

diff --cc bin/deploy-nonrtric
index c05bc72,bf0cf63..54d0dba
--- 1/bin/deploy-nonrtric
--- 2/bin/deploy-nonrtric
+++ b/bin/deploy-nonrtric
@@@ -53,13 -66,37 +66,37 @@@ f
  # 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"}
 +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

diff --cc bin/verify-ric-charts
Simple merge

diff --cc nonrtric/bin/install
Simple merge

diff --cc nonrtric/bin/uninstall
Simple merge