From a810256f30c7d54674c0e6dfee323f38b7f25b5b Mon Sep 17 00:00:00 2001
From: f10atin9 <f10atin9@kubesphere.io>
Date: Thu, 24 Feb 2022 16:01:37 +0800
Subject: [PATCH] fix prometheusURL

Signed-off-by: f10atin9 <f10atin9@kubesphere.io>
---
 cmd/controller-manager/app/controllers.go     | 37 +++++++++----------
 cmd/controller-manager/app/options/options.go |  3 ++
 cmd/controller-manager/app/server.go          |  1 +
 pkg/constants/constants.go                    |  3 --
 4 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/cmd/controller-manager/app/controllers.go b/cmd/controller-manager/app/controllers.go
index 2d818f057..2a69a68ed 100644
--- a/cmd/controller-manager/app/controllers.go
+++ b/cmd/controller-manager/app/controllers.go
@@ -20,8 +20,6 @@ import (
 	"fmt"
 	"time"
 
-	"kubesphere.io/kubesphere/pkg/constants"
-
 	"github.com/kubesphere/pvc-autoresizer/runners"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/util/sets"
@@ -355,24 +353,25 @@ func addAllControllers(mgr manager.Manager, client k8s.Client, informerFactory i
 	}
 
 	// "pvc-autoresizer"
-	if cmOptions.IsControllerEnabled("pvc-autoresizer") {
-		if err := runners.SetupIndexer(mgr, false); err != nil {
-			return err
+	monitoringOptionsEnable := cmOptions.MonitoringOptions != nil && len(cmOptions.MonitoringOptions.Endpoint) != 0
+	if monitoringOptionsEnable {
+		if cmOptions.IsControllerEnabled("pvc-autoresizer") {
+			if err := runners.SetupIndexer(mgr, false); err != nil {
+				return err
+			}
+			promClient, err := runners.NewPrometheusClient(cmOptions.MonitoringOptions.Endpoint)
+			if err != nil {
+				return err
+			}
+			pvcAutoResizerController := runners.NewPVCAutoresizer(
+				promClient,
+				mgr.GetClient(),
+				ctrl.Log.WithName("pvc-autoresizer"),
+				1*time.Minute,
+				mgr.GetEventRecorderFor("pvc-autoresizer"),
+			)
+			addController(mgr, "pvcautoresizer", pvcAutoResizerController)
 		}
-
-		prometheusUrl := "http://" + constants.PrometheusSvcName + "." + constants.KubeSphereMonitoringNamespace + ":" + constants.PrometheusSvcPort
-		promClient, err := runners.NewPrometheusClient(prometheusUrl)
-		if err != nil {
-			return err
-		}
-		pvcAutoResizerController := runners.NewPVCAutoresizer(
-			promClient,
-			mgr.GetClient(),
-			ctrl.Log.WithName("pvc-autoresizer"),
-			1*time.Minute,
-			mgr.GetEventRecorderFor("pvc-autoresizer"),
-		)
-		addController(mgr, "pvcautoresizer", pvcAutoResizerController)
 	}
 
 	if cmOptions.IsControllerEnabled("workload-Restart") {
diff --git a/cmd/controller-manager/app/options/options.go b/cmd/controller-manager/app/options/options.go
index a22b151ac..6f542397b 100644
--- a/cmd/controller-manager/app/options/options.go
+++ b/cmd/controller-manager/app/options/options.go
@@ -22,6 +22,8 @@ import (
 	"strings"
 	"time"
 
+	"kubesphere.io/kubesphere/pkg/simple/client/monitoring/prometheus"
+
 	controllerconfig "kubesphere.io/kubesphere/pkg/apiserver/config"
 
 	"k8s.io/apimachinery/pkg/util/sets"
@@ -57,6 +59,7 @@ type KubeSphereControllerManagerOptions struct {
 	MultiClusterOptions   *multicluster.Options
 	ServiceMeshOptions    *servicemesh.Options
 	GatewayOptions        *gateway.Options
+	MonitoringOptions     *prometheus.Options
 	LeaderElect           bool
 	LeaderElection        *leaderelection.LeaderElectionConfig
 	WebhookCertDir        string
diff --git a/cmd/controller-manager/app/server.go b/cmd/controller-manager/app/server.go
index 717bd3365..bbd03b139 100644
--- a/cmd/controller-manager/app/server.go
+++ b/cmd/controller-manager/app/server.go
@@ -62,6 +62,7 @@ func NewControllerManagerCommand() *cobra.Command {
 			MultiClusterOptions:   conf.MultiClusterOptions,
 			ServiceMeshOptions:    conf.ServiceMeshOptions,
 			GatewayOptions:        conf.GatewayOptions,
+			MonitoringOptions:     conf.MonitoringOptions,
 			LeaderElection:        s.LeaderElection,
 			LeaderElect:           s.LeaderElect,
 			WebhookCertDir:        s.WebhookCertDir,
diff --git a/pkg/constants/constants.go b/pkg/constants/constants.go
index 05be54b02..f5433ebfd 100644
--- a/pkg/constants/constants.go
+++ b/pkg/constants/constants.go
@@ -49,9 +49,6 @@ const (
 
 	UserNameHeader = "X-Token-Username"
 
-	PrometheusSvcName = "prometheus-k8s"
-	PrometheusSvcPort = "9090"
-
 	AuthenticationTag = "Authentication"
 	UserTag           = "User"
 	GroupTag          = "Group"