X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=ric-aux%2F85-Ext-Services%2Fbin%2Funinstall;h=02cee0ead8e26e364d502ccd41190cca9450a276;hb=refs%2Fchanges%2F34%2F1234%2F9;hp=97edfa2216f6198aa77673d07504aa571f54aec0;hpb=7907349292a23a3cd138dd64d9d7966edbefbb88;p=it%2Fdep.git

diff --git a/ric-aux/85-Ext-Services/bin/uninstall b/ric-aux/85-Ext-Services/bin/uninstall
index 97edfa22..02cee0ea 100755
--- a/ric-aux/85-Ext-Services/bin/uninstall
+++ b/ric-aux/85-Ext-Services/bin/uninstall
@@ -15,34 +15,16 @@
 #   See the License for the specific language governing permissions and        #
 #   limitations under the License.                                             #
 ################################################################################
+COMPONENTS="extsvcaux"
 
+echo "Undeploying RIC platform components [$COMPONENTS]"
 
 
 
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
+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
 
-
-source $DIR/../etc/ext.conf
-
-if [ -z "$RICAUX_RELEASE_NAME" ];then
-   RELEASE_NAME=$helm_release_name
-else
-   RELEASE_NAME=$RICAUX_RELEASE_NAME
-fi
-if [ -z "$RICAUX_NAMESPACE" ];then
-   NAMESPACE=$namespace
-else
-   NAMESPACE=$RICAUX_NAMESPACE
-fi
-
-RICAUX_COMPONENTS="ext"
-
-echo "Undeploying RIC AUX components [$RICAUX_COMPONENTS]"
-echo "Platform Namespace: $NAMESPACE"
-echo "Helm Release Name: $RELEASE_NAME"
-
-
-
-for component in $RICAUX_COMPONENTS; do
-  helm delete --purge  "${RELEASE_NAME}-$component" 
 done