From fdf5d73cb1f1fef6afca21c511d3588d65faa163 Mon Sep 17 00:00:00 2001 From: f10atin9 Date: Wed, 23 Feb 2022 16:35:54 +0800 Subject: [PATCH] add some constants, fixed prometheusURL hard code Signed-off-by: f10atin9 --- cmd/controller-manager/app/controllers.go | 5 ++++- pkg/constants/constants.go | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/cmd/controller-manager/app/controllers.go b/cmd/controller-manager/app/controllers.go index 0b0a15611..2d818f057 100644 --- a/cmd/controller-manager/app/controllers.go +++ b/cmd/controller-manager/app/controllers.go @@ -20,6 +20,8 @@ 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" @@ -358,7 +360,8 @@ func addAllControllers(mgr manager.Manager, client k8s.Client, informerFactory i return err } - promClient, err := runners.NewPrometheusClient("http://prometheus-k8s.kubesphere-monitoring-system:9090") + prometheusUrl := "http://" + constants.PrometheusSvcName + "." + constants.KubeSphereMonitoringNamespace + ":" + constants.PrometheusSvcPort + promClient, err := runners.NewPrometheusClient(prometheusUrl) if err != nil { return err } diff --git a/pkg/constants/constants.go b/pkg/constants/constants.go index f5433ebfd..05be54b02 100644 --- a/pkg/constants/constants.go +++ b/pkg/constants/constants.go @@ -49,6 +49,9 @@ const ( UserNameHeader = "X-Token-Username" + PrometheusSvcName = "prometheus-k8s" + PrometheusSvcPort = "9090" + AuthenticationTag = "Authentication" UserTag = "User" GroupTag = "Group"