X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Fk8s%2Funinstall_osm_k8s_monitoring.sh;fp=installers%2Fk8s%2Funinstall_osm_k8s_monitoring.sh;h=d5d5268767324cb2f87272a050cb170aa1dee7e5;hb=5bed3ad401d824ecf2ca08ff1e51b2cb2993f948;hp=1a3c77397893ec02e564af1eef0d54dc68ceff9a;hpb=953ab96e39b845a78501763c0bc92f7a356945cc;p=osm%2Fdevops.git diff --git a/installers/k8s/uninstall_osm_k8s_monitoring.sh b/installers/k8s/uninstall_osm_k8s_monitoring.sh index 1a3c7739..d5d52687 100755 --- a/installers/k8s/uninstall_osm_k8s_monitoring.sh +++ b/installers/k8s/uninstall_osm_k8s_monitoring.sh @@ -70,7 +70,8 @@ fi # remove dashboards echo "Deleting dashboards...." -kubectl -n $NAMESPACE delete configmap osm-monitoring-prometheus-summary-grafana > /dev/null 2>&1 +kubectl -n $NAMESPACE delete configmap osm-monitoring-osm-summary-grafana > /dev/null 2>&1 +kubectl -n $NAMESPACE delete configmap osm-monitoring-osm-nodes-grafana > /dev/null 2>&1 kubectl -n $NAMESPACE delete configmap osm-monitoring-prometheus-kafka-exporter-grafana > /dev/null 2>&1 kubectl -n $NAMESPACE delete configmap osm-monitoring-prometheus-mysql-exporter-grafana > /dev/null 2>&1 kubectl -n $NAMESPACE delete configmap osm-monitoring-prometheus-mongodb-exporter-grafana > /dev/null 2>&1 @@ -98,11 +99,9 @@ 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 + 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 - -