From: Zhe Huang <zhehuang@research.att.com>
Date: Tue, 18 Jun 2019 15:48:07 +0000 (+0000)
Subject: Merge "Add namespace name to release name"
X-Git-Tag: 0.0.2~94
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=965f7358a315dfd95a4098e0f64ad3368c9c7759;hp=8d90c3527c54ea27c61feecbbee2f1c09169e298;p=it%2Fdep.git

Merge "Add namespace name to release name"
---

diff --git a/ric-infra/20-Credential/bin/install b/ric-infra/20-Credential/bin/install
index a2619900..eb7bf21a 100755
--- a/ric-infra/20-Credential/bin/install
+++ b/ric-infra/20-Credential/bin/install
@@ -45,8 +45,8 @@ cp /tmp/common-$COMMON_CHART_VERSION.tgz $DIR/../helm/charts/
 
 
 if [ -z $OVERRIDEYAML ]; then
-  helm install --namespace "${NAMESPACE}" --name "${RELEASE_NAME}-credential" $DIR/../helm
+  helm install --namespace "${NAMESPACE}" --name "${RELEASE_NAME}-${NAMESPACE}-credential" $DIR/../helm
 else
-  helm install -f $OVERRIDEYAML --namespace "${NAMESPACE}" --name "${RELEASE_NAME}-credential" $DIR/../helm
+  helm install -f $OVERRIDEYAML --namespace "${NAMESPACE}" --name "${RELEASE_NAME}-${NAMESPACE}-credential" $DIR/../helm
 fi
 
diff --git a/ric-infra/20-Credential/bin/uninstall b/ric-infra/20-Credential/bin/uninstall
index f93004a6..c820c7f7 100755
--- a/ric-infra/20-Credential/bin/uninstall
+++ b/ric-infra/20-Credential/bin/uninstall
@@ -36,5 +36,5 @@ else
    NAMESPACE=$RICPLT_NAMESPACE
 fi
 
-  helm delete --purge "${RELEASE_NAME}-credential"
+helm delete --purge "${RELEASE_NAME}-${NAMESPACE}-credential"