Enabling helm3 & kubernetes 1.18 for RIC in shell scripts without breaking existing support for helm2 and K8 1.16 version
Issue-ID: RIC-678
Signed-off-by: Alok Bhatt <alok_bh@hcl.com>
Change-Id: Ibc1821aac0e91998117fc1f698008d7281f04dc4
diff --git a/bin/prepare-common-templates b/bin/prepare-common-templates
index d791e22..255c32d 100755
--- a/bin/prepare-common-templates
+++ b/bin/prepare-common-templates
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -x
################################################################################
# Copyright (c) 2019 AT&T Intellectual Property. #
# Copyright (c) 2019 Nokia. #
@@ -19,29 +19,46 @@
ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
+#Check for helm3
+IS_HELM3=$(helm version --short|grep -e "^v3")
+
# 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 "$HELM_REPO_PID" ]
+then
+ if [ -z $IS_HELM3 ]
+ then
+ nohup helm serve >& /dev/null &
+ else
+ nohup helm servecm --port=8879 --context-path=/charts --storage local >& /dev/null &
+ fi
fi
-
-
# Package common templates and serve it using Helm local repo
-HELM_HOME=$(helm home)
+if [ $IS_HELM3 ]
+then
+ eval $(helm env |grep HELM_REPOSITORY_CACHE)
+ HELM_LOCAL_REPO="${HELM_REPOSITORY_CACHE}/local/"
+ mkdir -p $HELM_LOCAL_REPO
+else
+ HELM_HOME=$(helm home)
+ HELM_LOCAL_REPO="${HELM_HOME}/repository/local/"
+fi
+
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/
+cp /tmp/ric-common-$COMMON_CHART_VERSION.tgz $HELM_LOCAL_REPO
AUX_COMMON_CHART_VERSION=$(cat $ROOT_DIR/../ric-common/Common-Template/helm/aux-common/Chart.yaml | grep version | awk '{print $2}')
helm package -d /tmp $ROOT_DIR/../ric-common/Common-Template/helm/aux-common
-cp /tmp/aux-common-$AUX_COMMON_CHART_VERSION.tgz $HELM_HOME/repository/local/
+cp /tmp/aux-common-$AUX_COMMON_CHART_VERSION.tgz $HELM_LOCAL_REPO
NONRTRIC_COMMON_CHART_VERSION=$(cat $ROOT_DIR/../ric-common/Common-Template/helm/nonrtric-common/Chart.yaml | grep version | awk '{print $2}')
helm package -d /tmp $ROOT_DIR/../ric-common/Common-Template/helm/nonrtric-common
-cp /tmp/nonrtric-common-$NONRTRIC_COMMON_CHART_VERSION.tgz $HELM_HOME/repository/local/
+cp /tmp/nonrtric-common-$NONRTRIC_COMMON_CHART_VERSION.tgz $HELM_LOCAL_REPO
-helm repo index $HELM_HOME/repository/local/
+helm repo index $HELM_LOCAL_REPO
# Make sure that helm local repo is added