feat: add global-option setting in configmap (#699)

Signed-off-by: sjcsjc123 <[email protected]>
alibaba · Jan 8, 2024 · c250e85 · c250e85
1 parent 1f7e98c
commit c250e85
Show file tree

Hide file tree

Showing 7 changed files with 1,400 additions and 32 deletions.
diff --git a/pkg/ingress/kube/configmap/config.go b/pkg/ingress/kube/configmap/config.go
@@ -34,14 +34,21 @@ const (
 type ItemEventHandler = func(name string)
 
 type HigressConfig struct {
-	Tracing *Tracing `json:"tracing,omitempty"`
-	Gzip    *Gzip    `json:"gzip,omitempty"`
+	Tracing              *Tracing    `json:"tracing,omitempty"`
+	Gzip                 *Gzip       `json:"gzip,omitempty"`
+	Downstream           *Downstream `json:"downstream,omitempty"`
+	DisableXEnvoyHeaders bool        `json:"disableXEnvoyHeaders,omitempty"`
+	AddXRealIpHeader     bool        `json:"addXRealIpHeader,omitempty"`
 }
 
 func NewDefaultHigressConfig() *HigressConfig {
+	globalOption := NewDefaultGlobalOption()
 	higressConfig := &HigressConfig{
-		Tracing: NewDefaultTracing(),
-		Gzip:    NewDefaultGzip(),
+		Tracing:              NewDefaultTracing(),
+		Gzip:                 NewDefaultGzip(),
+		Downstream:           globalOption.Downstream,
+		DisableXEnvoyHeaders: globalOption.DisableXEnvoyHeaders,
+		AddXRealIpHeader:     globalOption.AddXRealIpHeader,
 	}
 	return higressConfig
 }

diff --git a/pkg/ingress/kube/configmap/controller.go b/pkg/ingress/kube/configmap/controller.go
@@ -73,9 +73,14 @@ func NewConfigmapMgr(XDSUpdater model.XDSUpdater, namespace string, higressConfi
 	configmapMgr.SetHigressConfig(NewDefaultHigressConfig())
 
 	tracingController := NewTracingController(namespace)
-	gzipController := NewGzipController(namespace)
 	configmapMgr.AddItemControllers(tracingController)
+
+	gzipController := NewGzipController(namespace)
 	configmapMgr.AddItemControllers(gzipController)
+
+	globalOptionController := NewGlobalOptionController(namespace)
+	configmapMgr.AddItemControllers(globalOptionController)
+
 	configmapMgr.initEventHandlers()
 
 	return configmapMgr