X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=install%2Funinstall-nrt.sh;h=ab7d3fc6c5635fb6c2259a60fd0be93fde095cef;hb=54872c9d73ec5dc31dd0ba915cd1e0beb13a3096;hp=7b324ed36cc12f2d2dac57ce88c6bf49fc24cb76;hpb=d806dbef4f43bb9c631c818e96c1a39e440c5e6c;p=nonrtric%2Fplt%2Franpm.git

diff --git a/install/uninstall-nrt.sh b/install/uninstall-nrt.sh
index 7b324ed..ab7d3fc 100755
--- a/install/uninstall-nrt.sh
+++ b/install/uninstall-nrt.sh
@@ -29,14 +29,22 @@ check_error() {
 
 NUM_ERRORS=0
 
+helm uninstall -n nonrtric controlpanel
+check_error $? controlpanel
+helm uninstall -n nonrtric nonrtricgateway
+check_error $? nonrtricgateway
+
 helm uninstall -n ran ran
+check_error $? ran
 
 helm uninstall -n nonrtric nrt-pm
+check_error $? nrt-pm
 
 helm uninstall -n nonrtric nrt-base-1
+check_error $? nrt-base-1
 
 helm uninstall -n nonrtric nrt-base-0
-
+check_error $? nrt-base-0
 
 INST="strimzi-kafka CRDs"
 echo "##########################"
@@ -44,11 +52,8 @@ echo "Uninstall $INST"
 
 helm repo remove strimzi
 helm uninstall   -n nonrtric strimzi-kafka-crds
-#kubectl delete -f 'https://strimzi.io/install/latest?namespace=nonrtric' -n nonrtric
 check_error $? "$INST"
 
-helm uninstall namespaces
-
 # Print final result
 if [ $NUM_ERRORS -eq 0 ]; then
     echo "Uninstall PM Demo OK"
@@ -58,5 +63,3 @@ else
 fi
 
 exit 0
-
-