Fix prometheus configmap update in case of delete

main.go

@@ -611,14 +611,14 @@ func DeleteCluster(c *gin.Context) {
 		// cluster delete success
 		banzaiUtils.LogInfof(banzaiConstants.TagDeleteCluster, "Cluster %s delete succeeded!", cl.Name)
 
-		// update Prometheus config
-		updatePrometheus()
-
 		// delete state store
 		cloud.DestroyStateStore(cl)
 
 		// delete from db
-		cloud.DeleteFromDb(cl, c)
+		if cloud.DeleteFromDb(cl, c) {
+			// update Prometheus config
+			updatePrometheus()
+		}
 	}
 
 }

monitor/monitor.go

@@ -13,7 +13,6 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
-	"k8s.io/client-go/tools/clientcmd"
 )
 
 type prometheusTarget struct {
@@ -76,19 +75,9 @@ func UpdatePrometheusConfig() error {
 	}
 	prometheusConfigRaw := GenerateConfig(prometheusConfig)
 
-	var kubeconfig = os.Getenv("KUBECONFIG")
-	banzaiUtils.LogDebug(banzaiConstants.TagPrometheus, "KUBECONFIG:", kubeconfig)
-
-	var (
-		config *rest.Config
-		err    error
-	)
-	if kubeconfig != "" {
-		config, err = clientcmd.BuildConfigFromFlags("", kubeconfig)
-	} else {
-		banzaiUtils.LogInfo(banzaiConstants.TagPrometheus, "Use K8S InCluster Config.")
-		config, err = rest.InClusterConfig()
-	}
+	banzaiUtils.LogInfo(banzaiConstants.TagPrometheus, "Use K8S InCluster Config.")
+	config, err := rest.InClusterConfig()
+
 	if err != nil {
 		return fmt.Errorf("K8S Connection Failed: %v", err)
 	}