add helm env, fix java_sdk, fix prom ip, port

apache · Oct 7, 2023 · 0894751 · 0894751
1 parent 452b9ed
commit 0894751
Show file tree

Hide file tree

Showing 11 changed files with 33 additions and 28 deletions.
diff --git a/app/dubbo-cp/cmd/run.go b/app/dubbo-cp/cmd/run.go
@@ -19,6 +19,7 @@ package cmd
 
 import (
 	"fmt"
+	"os"
 	"time"
 
 	"github.com/apache/dubbo-kubernetes/pkg/webhook"
@@ -39,7 +40,11 @@ import (
 	"github.com/spf13/cobra"
 )
 
-const gracefullyShutdownDuration = 3 * time.Second
+const (
+	gracefullyShutdownDuration = 3 * time.Second
+	AdminRegistryAddress       = "ADMIN_REGISTRY_ADDRESS"
+	AdminPrometheusAddress     = "ADMIN_PROMETHEUS_ADDRESS"
+)
 
 // This is the open file limit below which the control plane may not
 // reasonably have enough descriptors to accept all its clients.
@@ -56,6 +61,16 @@ func newRunCmdWithOpts(opts cmd.RunCmdOpts) *cobra.Command {
 		RunE: func(cmd *cobra.Command, _ []string) error {
 			cfg := dubbo_cp.DefaultConfig()
 			err := config.Load(args.configPath, &cfg)
+			registryenv := os.Getenv(AdminRegistryAddress)
+			promenv := os.Getenv(AdminPrometheusAddress)
+			if registryenv != "" {
+				cfg.Admin.Registry.Address = registryenv
+				cfg.Admin.MetadataReport.Address = registryenv
+				cfg.Admin.ConfigCenter = registryenv
+			}
+			if promenv != "" {
+				cfg.Admin.Prometheus.Address = promenv
+			}
 			if err != nil {
 				logger.Sugar().Error(err, "could not load the configuration")
 				return err

diff --git a/conf/admin.yml b/conf/admin.yml
@@ -20,8 +20,7 @@ admin:
   registry:
     address: zookeeper://127.0.0.1:2181
   prometheus:
-    ip: 127.0.0.1
-    port: 9090
+    address: 127.0.0.1:9090
     monitor-port: 22222
 #  mysql-dsn: root:password@tcp(127.0.0.1:3306)/dubbo-admin?charset=utf8&parseTime=true
 security:

diff --git a/pkg/admin/bootstrap.go b/pkg/admin/bootstrap.go
@@ -65,8 +65,7 @@ func RegisterDatabase(rt core_runtime.Runtime) error {
 
 func RegisterOther(rt core_runtime.Runtime) error {
 	config.AdminPort = rt.Config().Admin.AdminPort
-	config.PrometheusIp = rt.Config().Admin.Prometheus.Ip
-	config.PrometheusPort = rt.Config().Admin.Prometheus.Port
+	config.PrometheusAddress = rt.Config().Admin.Prometheus.Address
 	config.PrometheusMonitorPort = rt.Config().Admin.Prometheus.MonitorPort
 	address := rt.Config().Admin.ConfigCenter
 	registryAddress := rt.Config().Admin.Registry.Address

diff --git a/pkg/admin/config/config.go b/pkg/admin/config/config.go
@@ -36,8 +36,7 @@ var (
 )
 
 var (
-	PrometheusIp          string
-	PrometheusPort        string
+	PrometheusAddress     string
 	PrometheusMonitorPort string
 	AdminPort             int
 )
diff --git a/pkg/admin/services/prometheus_service_impl.go b/pkg/admin/services/prometheus_service_impl.go
@@ -17,7 +17,6 @@ package services
 
 import (
 	"context"
-	"fmt"
 	"net/http"
 	"time"
 
@@ -125,11 +124,8 @@ func (p *PrometheusServiceImpl) FlowMetrics() (model.FlowMetricsRes, error) {
 		Data: make(map[string]float64),
 	}
 
-	ip := config.PrometheusIp
-	port := config.PrometheusPort
-	address := fmt.Sprintf("http://%s:%s", ip, port)
 	client, err := api.NewClient(api.Config{
-		Address: address,
+		Address: config.PrometheusAddress,
 	})
 	if err != nil {
 		logger2.Sugar().Errorf("Error creating clientgen: %v\n", err)

diff --git a/pkg/config/admin/config.go b/pkg/config/admin/config.go
@@ -33,8 +33,7 @@ type Admin struct {
 }
 
 type Prometheus struct {
-	Ip          string `json:"ip"`
-	Port        string `json:"port"`
+	Address     string `json:"address"`
 	MonitorPort string `json:"monitor-port"`
 }
 

diff --git a/pkg/config/app/dubbo-cp/config.go b/pkg/config/app/dubbo-cp/config.go
@@ -84,8 +84,7 @@ var DefaultConfig = func() Config {
 				Address: "zookeeper://127.0.0.1:2181",
 			},
 			Prometheus: admin.Prometheus{
-				Ip:          "127.0.0.1",
-				Port:        "9090",
+				Address:     "127.0.0.1:9090",
 				MonitorPort: "22222",
 			},
 			// MysqlDSN: "root:password@tcp(127.0.0.1:3306)/dubbo-admin?charset=utf8&parseTime=true",

diff --git a/pkg/config/app/dubbo-cp/dubbo-cp.default.yaml b/pkg/config/app/dubbo-cp/dubbo-cp.default.yaml
@@ -20,8 +20,7 @@ admin:
   registry:
     address: zookeeper://127.0.0.1:2181
   prometheus:
-    ip: 127.0.0.1
-    port: 9090
+    address: 127.0.0.1:9090
     monitor-port: 22222
 #  mysql-dsn: root:password@tcp(127.0.0.1:3306)/dubbo-admin?charset=utf8&parseTime=true
 security:

diff --git a/pkg/webhook/patch/javasdk.go → pkg/webhook/patch/dubbosdk.go b/pkg/webhook/patch/javasdk.go → pkg/webhook/patch/dubbosdk.go
@@ -25,14 +25,14 @@ import (
 	"k8s.io/client-go/kubernetes"
 )
 
-type JavaSdk struct {
+type DubboSdk struct {
 	options       *dubbo_cp.Config
 	webhookClient webhook.Client
 	kubeClient    kubernetes.Interface
 }
 
-func NewJavaSdk(options *dubbo_cp.Config, webhookClient webhook.Client, kubeClient kubernetes.Interface) *JavaSdk {
-	return &JavaSdk{
+func NewJavaSdk(options *dubbo_cp.Config, webhookClient webhook.Client, kubeClient kubernetes.Interface) *DubboSdk {
+	return &DubboSdk{
 		options:       options,
 		webhookClient: webhookClient,
 		kubeClient:    kubeClient,
@@ -44,11 +44,11 @@ const (
 	Labeled       = "true"
 )
 
-func (s *JavaSdk) NewPodWithDubboRegistryInject(origin *v1.Pod) (*v1.Pod, error) {
+func (s *DubboSdk) NewPodWithDubboRegistryInject(origin *v1.Pod) (*v1.Pod, error) {
 	return nil, nil
 }
 
-func (s *JavaSdk) NewPodWithDubboCa(origin *v1.Pod) (*v1.Pod, error) {
+func (s *DubboSdk) NewPodWithDubboCa(origin *v1.Pod) (*v1.Pod, error) {
 	target := origin.DeepCopy()
 	expireSeconds := int64(ExpireSeconds)
 
@@ -85,7 +85,7 @@ func (s *JavaSdk) NewPodWithDubboCa(origin *v1.Pod) (*v1.Pod, error) {
 	return target, nil
 }
 
-func (s *JavaSdk) injectContainers(c *v1.Container) {
+func (s *DubboSdk) injectContainers(c *v1.Container) {
 	c.Env = append(c.Env, v1.EnvVar{
 		Name:  "DUBBO_CA_ADDRESS",
 		Value: s.options.KubeConfig.ServiceName + "." + s.options.KubeConfig.Namespace + ".svc:" + strconv.Itoa(s.options.GrpcServer.SecureServerPort),
@@ -115,7 +115,7 @@ func (s *JavaSdk) injectContainers(c *v1.Container) {
 	})
 }
 
-func (s *JavaSdk) injectVolumes(target *v1.Pod, expireSeconds int64) {
+func (s *DubboSdk) injectVolumes(target *v1.Pod, expireSeconds int64) {
 	target.Spec.Volumes = append(target.Spec.Volumes, v1.Volume{
 		Name: "dubbo-ca-token",
 		VolumeSource: v1.VolumeSource{
@@ -156,7 +156,7 @@ func (s *JavaSdk) injectVolumes(target *v1.Pod, expireSeconds int64) {
 	})
 }
 
-func (s *JavaSdk) checkContainers(c v1.Container, shouldInject bool) bool {
+func (s *DubboSdk) checkContainers(c v1.Container, shouldInject bool) bool {
 	for _, e := range c.Env {
 		if e.Name == "DUBBO_CA_ADDRESS" {
 			shouldInject = false
@@ -189,7 +189,7 @@ func (s *JavaSdk) checkContainers(c v1.Container, shouldInject bool) bool {
 	return shouldInject
 }
 
-func (s *JavaSdk) checkVolume(target *v1.Pod, shouldInject bool) bool {
+func (s *DubboSdk) checkVolume(target *v1.Pod, shouldInject bool) bool {
 	for _, v := range target.Spec.Volumes {
 		if v.Name == "dubbo-ca-token" {
 			shouldInject = false

diff --git a/pkg/webhook/patch/javasdk_test.go → pkg/webhook/patch/dubbosdk_test.go b/pkg/webhook/patch/javasdk_test.go → pkg/webhook/patch/dubbosdk_test.go
diff --git a/pkg/webhook/server/server.go b/pkg/webhook/server/server.go
@@ -34,7 +34,7 @@ type WebhookServer struct {
 	CertStorage   *cert.CertStorage
 
 	WebhookServer *webhook.Webhook
-	JavaInjector  *patch.JavaSdk
+	JavaInjector  *patch.DubboSdk
 }
 
 func NewServer(options *dubbo_cp.Config) *WebhookServer {