feat hepa api proxy host pass-through set default as true

chengjoey · Apr 17, 2024 · 3e1e321 · 3e1e321
1 parent 7b69390
commit 3e1e321
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 1 deletion.
diff --git a/internal/tools/orchestrator/hepa/apipolicy/policies/proxy/policy.go b/internal/tools/orchestrator/hepa/apipolicy/policies/proxy/policy.go
@@ -22,6 +22,7 @@ import (
 
 	"github.com/erda-project/erda/internal/tools/orchestrator/hepa/apipolicy"
 	annotationscommon "github.com/erda-project/erda/internal/tools/orchestrator/hepa/common"
+	"github.com/erda-project/erda/internal/tools/orchestrator/hepa/config"
 	gatewayproviders "github.com/erda-project/erda/internal/tools/orchestrator/hepa/gateway-providers"
 	providerDto "github.com/erda-project/erda/internal/tools/orchestrator/hepa/gateway-providers/dto"
 	mseCommon "github.com/erda-project/erda/internal/tools/orchestrator/hepa/gateway-providers/mse/common"
@@ -42,7 +43,7 @@ func (policy Policy) CreateDefaultConfig(gatewayProvider string, ctx map[string]
 		ClientRespTimeout: 60,
 		ProxyReqTimeout:   60,
 		ProxyRespTimeout:  60,
-		HostPassthrough:   false,
+		HostPassthrough:   config.APIProxyPolicyHostPassThrough(),
 		SSLRedirect:       true,
 	}
 	dto.Switch = false

diff --git a/internal/tools/orchestrator/hepa/config/config.go b/internal/tools/orchestrator/hepa/config/config.go
@@ -14,6 +14,22 @@
 
 package config
 
+import "github.com/erda-project/erda/pkg/envconf"
+
+type Conf struct {
+	APIProxyPolicyHostPassThrough bool `file:"api_proxy_policy_host_pass_through" default:"true"`
+}
+
+var cfg Conf
+
+func Load() {
+	envconf.MustLoad(&cfg)
+}
+
+func APIProxyPolicyHostPassThrough() bool {
+	return cfg.APIProxyPolicyHostPassThrough
+}
+
 var ServerConf *ServerConfig
 var LogConf *LogConfig
 

diff --git a/internal/tools/orchestrator/hepa/provider.go b/internal/tools/orchestrator/hepa/provider.go
@@ -51,13 +51,15 @@ type provider struct {
 }
 
 func (p *provider) Init(ctx servicehub.Context) error {
+	config.Load()
 	config.ServerConf = &p.Cfg.Server
 	config.LogConf = &p.Cfg.Log
 	common.InitLogger()
 	orm.Init()
 	logrus.Info(version.String())
 	logrus.Infof("server conf: %+v", config.ServerConf)
 	logrus.Infof("log conf: %+v", config.LogConf)
+	logrus.Infof("default api proxy policy host pass through: %v", config.APIProxyPolicyHostPassThrough())
 	orgCache.CacheInit(p.Org)
 	p.HttpServer.GET("/api/gateway/openapi/metrics/*", func(resp http.ResponseWriter, req *http.Request) {
 		path := strings.Replace(req.URL.Path, "/api/gateway/openapi/metrics/charts", "/api/metrics", 1)