jiazhizhong/higress
1
0
Fork 0
mirror of https://github.com/alibaba/higress.git synced 2026-06-06 03:07:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

optimize default action of route envoyfilter (#985)

Browse Source
This commit is contained in:
澄潭
2024-05-21 23:57:13 +08:00
committed by GitHub
parent d91b22f8c2
commit af8eff2bd6
2 changed files with 3 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/ingress/kube/configmap/global.go
View File

@@ -636,6 +636,9 @@ func (g *GlobalOptionController) constructBufferLimit(downstream *Downstream) st
// constructRouteTimeout constructs the route timeout config. // constructRouteTimeout constructs the route timeout config.
func (g *GlobalOptionController) constructRouteTimeout(downstream *Downstream) string { func (g *GlobalOptionController) constructRouteTimeout(downstream *Downstream) string {
if downstream.RouteTimeout == 0 {
return ""
}
return fmt.Sprintf(` return fmt.Sprintf(`
{ {
"route": { "route": {

24
test/e2e/conformance/tests/configmap-global.go
View File

@@ -504,14 +504,6 @@ var ConfigMapGlobalEnvoy = suite.ConformanceTest{
"idle_timeout": "180s", "idle_timeout": "180s",
}, },
}, },
{
Path: "configs.#.dynamic_route_configs.#.route_config.virtual_hosts.#.routes.#.route",
CheckType: envoy.CheckTypeMatch,
TargetNamespace: "higress-system",
ExpectEnvoyConfig: map[string]interface{}{
"timeout": "0s",
},
},
{ {
Path: "configs.#.dynamic_active_clusters.#.cluster", Path: "configs.#.dynamic_active_clusters.#.cluster",
CheckType: envoy.CheckTypeMatch, CheckType: envoy.CheckTypeMatch,
@@ -778,14 +770,6 @@ var ConfigMapGlobalEnvoy = suite.ConformanceTest{
"idle_timeout": "180s", "idle_timeout": "180s",
}, },
}, },
{
Path: "configs.#.dynamic_route_configs.#.route_config.virtual_hosts.#.routes.#.route",
CheckType: envoy.CheckTypeMatch,
TargetNamespace: "higress-system",
ExpectEnvoyConfig: map[string]interface{}{
"timeout": "0s",
},
},
{ {
Path: "configs.#.dynamic_active_clusters.#.cluster", Path: "configs.#.dynamic_active_clusters.#.cluster",
CheckType: envoy.CheckTypeMatch, CheckType: envoy.CheckTypeMatch,
@@ -968,14 +952,6 @@ var ConfigMapGlobalEnvoy = suite.ConformanceTest{
"idle_timeout": "180s", "idle_timeout": "180s",
}, },
}, },
{
Path: "configs.#.dynamic_route_configs.#.route_config.virtual_hosts.#.routes.#.route",
CheckType: envoy.CheckTypeMatch,
TargetNamespace: "higress-system",
ExpectEnvoyConfig: map[string]interface{}{
"timeout": "0s",
},
},
{ {
Path: "configs.#.dynamic_active_clusters.#.cluster", Path: "configs.#.dynamic_active_clusters.#.cluster",
CheckType: envoy.CheckTypeMatch, CheckType: envoy.CheckTypeMatch,