X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=ric-infra%2F40-Credential%2Fbin%2Funinstall;fp=ric-infra%2F40-Credential%2Fbin%2Funinstall;h=c45136f336454150bd475009b46e5e61048d1eda;hb=9c381477a3319e5dff968b1a4e8566c71499b3b6;hp=e112c06137ce612ffbbb4e4f3d937780315007bc;hpb=05175041bd4df59ed506224331a4bb246c1edf5e;p=it%2Fdep.git

diff --git a/ric-infra/40-Credential/bin/uninstall b/ric-infra/40-Credential/bin/uninstall
index e112c061..c45136f3 100755
--- a/ric-infra/40-Credential/bin/uninstall
+++ b/ric-infra/40-Credential/bin/uninstall
@@ -17,45 +17,15 @@
 ################################################################################
 
 
-OVERRIDEYAML=$1
+COMPONENTS="credential"
 
+echo "Undeploying RIC infra components [$COMPONENTS]"
 
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
-
-
-source $DIR/../etc/credential.conf
-
-if [ -z "$RICINFRA_RELEASE_NAME" ];then
-   RELEASE_NAME=$helm_release_name
-else
-   RELEASE_NAME=$RICINFRA_RELEASE_NAME
-fi
-
-# Namespace configuration
-if [ -z "$RICPLT_NAMESPACE" ];then
-   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
-   INFRA_NAMESPACE=$RICINFRA_NAMESPACE
-fi
-
-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"
 
+for component in $COMPONENTS; do
+    RELEASE_LIST=$(helm list | grep "$component" | awk '{print $1}')
+    if [ ! -z "$RELEASE_LIST" ];then
+        helm delete --purge $RELEASE_LIST
+    fi
 
+done