X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=ric-aux%2F80-Auxiliary-Functions%2Fbin%2Funinstall;h=6cb3b3edbc93ca9c8b7c96aa1f2e414e86f4bced;hb=refs%2Fchanges%2F34%2F1234%2F9;hp=c86e42b3c1d6befb8c12f9bd433e069dd26f8b57;hpb=ef05762e72bf0af584301bf58b2035f7ac4e3842;p=it%2Fdep.git

diff --git a/ric-aux/80-Auxiliary-Functions/bin/uninstall b/ric-aux/80-Auxiliary-Functions/bin/uninstall
index c86e42b3..6cb3b3ed 100755
--- a/ric-aux/80-Auxiliary-Functions/bin/uninstall
+++ b/ric-aux/80-Auxiliary-Functions/bin/uninstall
@@ -17,26 +17,16 @@
 ################################################################################
 
 
+COMPONENTS="dashboard message-router ves mrsub mc-stack portal aaf"
 
+echo "Undeploying RIC aux components [$COMPONENTS]"
 
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
 
 
-source $DIR/../etc/aux.conf
+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
 
-if [ -z "$RICAUX_RELEASE_NAME" ];then
-   RELEASE_NAME=$helm_release_name
-else
-   RELEASE_NAME=$RICAUX_RELEASE_NAME
-fi
-
-RICAUX_COMPONENTS="dashboard message-router ves"
-
-echo "Undeploying RIC AUX components [$RICAUX_COMPONENTS]"
-echo "Helm Release Name: $RELEASE_NAME"
-
-
-
-for component in $RICAUX_COMPONENTS; do
-  helm delete --purge  "${RELEASE_NAME}-$component" 
 done