X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Fk8s%2Funinstall_osm_k8s_monitoring.sh;h=1ad240b3da3f829f858eb0475ed90d548e728901;hb=HEAD;hp=d5d5268767324cb2f87272a050cb170aa1dee7e5;hpb=1e76a0c26ec0fd74c7b93aa67232402f6d760a66;p=osm%2Fdevops.git

diff --git a/installers/k8s/uninstall_osm_k8s_monitoring.sh b/installers/k8s/uninstall_osm_k8s_monitoring.sh
index d5d52687..1ad240b3 100755
--- a/installers/k8s/uninstall_osm_k8s_monitoring.sh
+++ b/installers/k8s/uninstall_osm_k8s_monitoring.sh
@@ -21,13 +21,11 @@ function usage(){
     echo -e "Uninstall OSM Monitoring"
     echo -e "  OPTIONS"
     echo -e "     -n <namespace>:   use specified kubernetes namespace - default: monitoring"
-    echo -e "     --helm        :   uninstall tiller"
     echo -e "     --debug       :   debug script"
     echo -e "     -h / --help   :   print this help"
 }
 
 NAMESPACE=monitoring
-HELM=""
 DEBUG=""
 while getopts ":h-:n:" o; do
     case "${o}" in
@@ -40,7 +38,6 @@ while getopts ":h-:n:" o; do
 
         -)
             [ "${OPTARG}" == "help" ] && usage && exit 0
-            [ "${OPTARG}" == "helm" ] && HELM="y" && continue
             [ "${OPTARG}" == "debug" ] && DEBUG="y" && continue
             echo -e "Invalid option: '--$OPTARG'\n" >&2
             usage && exit 1
@@ -58,7 +55,6 @@ done
 
 function dump_vars(){
     echo "NAMESPACE=$NAMESPACE"
-    echo "HELM=$NOTILLER"
     echo "DEBUG=$DEBUG"
 }
 
@@ -82,8 +78,8 @@ helm delete --purge osm-kafka-exporter > /dev/null 2>&1
 helm delete --purge osm-mysql-exporter > /dev/null 2>&1
 helm delete --purge osm-mongodb-exporter > /dev/null 2>&1
 
-# remove prometheus-operator
-echo "Deleting prometheus-operator...."
+# remove kube-prometheus-stack
+echo "Deleting kube-prometheus-stack...."
 helm delete --purge osm-monitoring > /dev/null 2>&1
 
 # Delete CRDs
@@ -94,14 +90,18 @@ kubectl delete crd prometheuses.monitoring.coreos.com > /dev/null 2>&1
 kubectl delete crd alertmanagers.monitoring.coreos.com > /dev/null 2>&1
 kubectl delete crd podmonitors.monitoring.coreos.com > /dev/null 2>&1
 
+# Delete svcs
+kubectl -n kube-system delete service osm-monitoring-kube-promet-coredns
+kubectl -n kube-system delete service osm-monitoring-kube-promet-kube-controller-manager
+kubectl -n kube-system delete service osm-monitoring-kube-promet-kube-etcd
+kubectl -n kube-system delete service osm-monitoring-kube-promet-kube-proxy
+kubectl -n kube-system delete service osm-monitoring-kube-promet-kube-scheduler
+kubectl -n kube-system delete service osm-monitoring-kube-promet-kubelet
+
+# Delete webhooks
+kubectl delete validatingwebhookconfigurations.admissionregistration.k8s.io osm-monitoring-kube-promet-admission
+kubectl delete mutatingwebhookconfigurations.admissionregistration.k8s.io osm-monitoring-kube-promet-admission
+
 # Delete monitoring namespace
 echo "Deleting monitoring namespace...."
 kubectl delete namespace $NAMESPACE
-
-if [ -n "$HELM" ] ; then
-    sudo helm reset --force
-    kubectl delete --namespace kube-system serviceaccount tiller
-    kubectl delete clusterrolebinding tiller-cluster-rule
-    sudo rm /usr/local/bin/helm
-    rm -rf $HOME/.helm
-fi