X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=ric-infra%2F40-Credential%2Fbin%2Funinstall;h=e112c06137ce612ffbbb4e4f3d937780315007bc;hb=96f1edd267659d09822b64fffa16077e28fcec0b;hp=c820c7f703cee57794ff5c30b357acf42217f0a7;hpb=6be690a94ce6d07750a9783f31f36f8ae3854703;p=it%2Fdep.git

diff --git a/ric-infra/40-Credential/bin/uninstall b/ric-infra/40-Credential/bin/uninstall
index c820c7f7..e112c061 100755
--- a/ric-infra/40-Credential/bin/uninstall
+++ b/ric-infra/40-Credential/bin/uninstall
@@ -25,16 +25,37 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
 
 source $DIR/../etc/credential.conf
 
-if [ -z "$RICPLT_RELEASE_NAME" ];then
+if [ -z "$RICINFRA_RELEASE_NAME" ];then
    RELEASE_NAME=$helm_release_name
 else
-   RELEASE_NAME=$RICPLT_RELEASE_NAME
+   RELEASE_NAME=$RICINFRA_RELEASE_NAME
 fi
+
+# Namespace configuration
 if [ -z "$RICPLT_NAMESPACE" ];then
-   NAMESPACE=$namespace
+   PLT_NAMESPACE=$plt_namespace
+else
+   PLT_NAMESPACE=$RICPLT_NAMESPACE
+fi
+if [ -z "$RICXAPP_NAMESPACE" ];then
+   XAPP_NAMESPACE=$xapp_namespace
+else
+   XAPP_NAMESPACE=$RICXAPP_NAMESPACE
+fi
+if [ -z "$RICAUX_NAMESPACE" ];then
+   AUX_NAMESPACE=$aux_namespace
+else
+   AUX_NAMESPACE=$RICAUX_NAMESPACE
+fi
+if [ -z "$RICINFRA_NAMESPACE" ];then
+   INFRA_NAMESPACE=$infra_namespace
 else
-   NAMESPACE=$RICPLT_NAMESPACE
+   INFRA_NAMESPACE=$RICINFRA_NAMESPACE
 fi
 
-helm delete --purge "${RELEASE_NAME}-${NAMESPACE}-credential"
+helm delete --purge "${RELEASE_NAME}-${PLT_NAMESPACE}-credential"
+helm delete --purge "${RELEASE_NAME}-${XAPP_NAMESPACE}-credential"
+helm delete --purge "${RELEASE_NAME}-${AUX_NAMESPACE}-credential"
+helm delete --purge "${RELEASE_NAME}-${INFRA_NAMESPACE}-credential"
+