admin/kubesphere
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add some constants, fixed prometheusURL hard code

Browse Source 
Signed-off-by: f10atin9 <f10atin9@kubesphere.io>
This commit is contained in:
f10atin9
2022-02-23 16:35:54 +08:00
parent 7f5a90bf52
commit fdf5d73cb1
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/controller-manager/app/controllers.go
View File

@@ -20,6 +20,8 @@ import (
"fmt" "fmt"
"time" "time"
"kubesphere.io/kubesphere/pkg/constants"
"github.com/kubesphere/pvc-autoresizer/runners" "github.com/kubesphere/pvc-autoresizer/runners"
"k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/sets"
@@ -358,7 +360,8 @@ func addAllControllers(mgr manager.Manager, client k8s.Client, informerFactory i
return err 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 { if err != nil {
return err return err
} }

3
pkg/constants/constants.go
View File

@@ -49,6 +49,9 @@ const (
UserNameHeader = "X-Token-Username" UserNameHeader = "X-Token-Username"
PrometheusSvcName = "prometheus-k8s"
PrometheusSvcPort = "9090"
AuthenticationTag = "Authentication" AuthenticationTag = "Authentication"
UserTag = "User" UserTag = "User"
GroupTag = "Group" GroupTag = "Group"