Merge "Add namespace name to release name"

diff --git a/ric-infra/20-Credential/bin/install b/ric-infra/20-Credential/bin/install
index a261990..eb7bf21 100755 (executable)
--- 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 f93004a..c820c7f 100755 (executable)
--- 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"