Merge "Enabling helm3 & kubernetes 1.18 for RIC"

[it/dep.git] / nonrtric / bin / uninstall

diff --git a/nonrtric/bin/uninstall b/nonrtric/bin/uninstall
index 4ace9fb..06c00c1 100755 (executable)
--- a/nonrtric/bin/uninstall
+++ b/nonrtric/bin/uninstall
@@ -16,7 +16,7 @@
 ################################################################################
 
 
-COMPONENTS="controlpanel a1controller a1simulator policymanagementservice"
+COMPONENTS="controlpanel a1controller a1simulator policymanagementservice enrichmentservice"
 RECIPE_NAMESPACE=$(kubectl get cm --all-namespaces | grep nonrtric-recipe | awk '{print $1}')
 kubectl get configmap  -n $RECIPE_NAMESPACE nonrtric-recipe  -o jsonpath='{.data.recipe}' > /tmp/recipe.yaml
 
@@ -32,7 +32,16 @@ RELEASE_PREFIX=$(echo "$COMMON_BLOCK" | awk '/^ *releasePrefix:/{print $2}')
 
 echo "Undeploying NONRTRIC components [$COMPONENTS]"
 
-helm delete --purge ${RELEASE_PREFIX}
+IS_HELM3=$(helm version -c --short|grep -e "^v3")
+HELM_FLAG=''
+if [ $IS_HELM3 ]
+then
+  HELM_FLAG=' -n '${NONRTRIC_NAMESPACE:-nonrtric}
+else
+  HELM_FLAG='--purge'
+fi
+
+helm delete ${HELM_FLAG} ${RELEASE_PREFIX}
 
 kubectl delete cm -n ${NONRTRIC_NAMESPACE:-nonrtric} nonrtric-recipe