X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=bin%2Funinstall;h=2fb080eae8da9307d08ba278c09704e96cce78f1;hb=e38909d471f83d7b9ca051bd8deeee3d7c9a167b;hp=7d9de8ee4c5b35e2e004ae485170b62a90728bd6;hpb=7d4bbf1f806604b6c83142d5b14a271a19a93841;p=ric-plt%2Fric-dep.git

diff --git a/bin/uninstall b/bin/uninstall
index 7d9de8e..2fb080e 100755
--- a/bin/uninstall
+++ b/bin/uninstall
@@ -16,7 +16,7 @@
 #   limitations under the License.                                             #
 ################################################################################
 
-COMPONENTS="appmgr rtmgr dbaas1 dbaasha e2mgr e2term a1mediator submgr vespamgr rsm jaegeradapter infrastructure o1mediator"
+COMPONENTS="xapp-onboarder appmgr rtmgr e2mgr e2term a1mediator submgr vespamgr jaegeradapter dbaas infrastructure o1mediator alarmmanager"
 RECIPE_NAMESPACE=$(kubectl get cm --all-namespaces | grep ricplt-recipe | awk '{print $1}')
 kubectl get configmap  -n $RECIPE_NAMESPACE ricplt-recipe  -o jsonpath='{.data.recipe}' > /tmp/recipe.yaml
 
@@ -32,12 +32,22 @@ INFRANAMESPACE=$(echo "$NAMESPACE_BLOCK" | awk '/^ *infra:/{print $2}')
 XAPPNAMESPACE=$(echo "$NAMESPACE_BLOCK" | awk '/^ *xapp:/{print $2}')
 RELEASE_PREFIX=$(echo "$COMMON_BLOCK" | awk '/^ *releasePrefix:/{print $2}')
 
+IS_HELM3=$(helm version --short|grep -e "^v3")
 
 echo "Undeploying RIC platform components [$COMPONENTS]"
 
 
+HELM_FLAG=''
+if [ $IS_HELM3 ]
+then 
+  HELM_FLAG=' -n '${PLTNAMESPACE:-ricplt}
+else
+  HELM_FLAG='--purge'
+fi
+
+
 for component in $COMPONENTS; do
-    helm delete --purge ${RELEASE_PREFIX}-$component
+    helm delete $HELM_FLAG ${RELEASE_PREFIX}-$component
 done
 
 kubectl delete cm -n ${PLTNAMESPACE:-ricplt} ricplt-recipe