Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(meshtimeout): don't set default timeouts on inbound cluster and listener #12043

Merged
merged 3 commits into from
Nov 14, 2024
Merged

fix(meshtimeout): don't set default timeouts on inbound cluster and listener #12043

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2e44ed0
test(unit): show that timeouts are applied even when there is no policy
lukidzi Nov 14, 2024
3988a08
fix(meshtimeout): do not apply default timeouts if there is no policy
lukidzi Nov 14, 2024
7b66919
test(unit): show that there is no timeout applied
lukidzi Nov 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ...s/policies/meshtimeout/plugin/testdata/basic_without_defaults_inbound_cluster.golden.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
name: localhost:8080
32 changes: 32 additions & 0 deletions .../policies/meshtimeout/plugin/testdata/basic_without_defaults_inbound_listener.golden.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
address:
socketAddress:
address: 127.0.0.1
portValue: 80
enableReusePort: false
filterChains:
- filters:
- name: envoy.filters.network.http_connection_manager
typedConfig:
'@type': type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager
httpFilters:
- name: envoy.filters.http.router
typedConfig:
'@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router
routeConfig:
name: inbound:backend
requestHeadersToRemove:
- x-kuma-tags
validateClusters: false
virtualHosts:
- domains:
- '*'
name: backend
routes:
- match:
prefix: /
route:
cluster: backend
timeout: 0s
statPrefix: inbound_127_0_0_1_80
name: inbound:127.0.0.1:80
trafficDirection: INBOUND
2 changes: 1 addition & 1 deletion pkg/plugins/policies/meshtimeout/plugin/v1alpha1/plugin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ func applyToInbounds(fromRules core_rules.FromRules, inboundListeners map[core_r
protocol := core_mesh.ParseProtocol(inbound.GetProtocol())
conf := getConf(fromRules.Rules[listenerKey], core_rules.MeshSubset())
if conf == nil {
conf = &plugin_xds.DefaultTimeoutConf
continue
}
configurer := plugin_xds.ListenerConfigurer{
Conf: *conf,
Expand Down
24 changes: 24 additions & 0 deletions pkg/plugins/policies/meshtimeout/plugin/v1alpha1/plugin_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,30 @@ var _ = Describe("MeshTimeout", func() {
expectedClusters: []string{"basic_inbound_cluster.golden.yaml"},
expectedListeners: []string{"basic_inbound_listener.golden.yaml"},
}),
Entry("basic inbound route without defaults", sidecarTestCase{
resources: []core_xds.Resource{
{
Name: "inbound",
Origin: generator.OriginInbound,
Resource: httpInboundListenerWith(),
},
{
Name: "inbound",
Origin: generator.OriginInbound,
Resource: test_xds.ClusterWithName(fmt.Sprintf("localhost:%d", builders.FirstInboundServicePort)),
},
},
fromRules: core_rules.FromRules{
Rules: map[core_rules.InboundListener]core_rules.Rules{
{
Address: "127.0.0.1",
Port: 80,
}: []*core_rules.Rule{},
},
},
expectedClusters: []string{"basic_without_defaults_inbound_cluster.golden.yaml"},
expectedListeners: []string{"basic_without_defaults_inbound_listener.golden.yaml"},
}),
Entry("outbound with defaults when http conf missing", sidecarTestCase{
resources: []core_xds.Resource{
{
Expand Down
Loading