3pp-mirror/pomerium
1
0
Fork 0
mirror of https://github.com/pomerium/pomerium.git synced 2025-07-26 04:58:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

match Go default TCP keepalive settings

Browse source
This commit is contained in:
Kenneth Jenkins 2024-01-09 15:53:03 -08:00
parent 78fe503b57
commit 136984fb14
2 changed files with 26 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
config/envoyconfig/clusters.go
View file

@ -142,9 +142,13 @@ func (b *Builder) buildInternalCluster(
) (*envoy_config_cluster_v3.Cluster, error) { ) (*envoy_config_cluster_v3.Cluster, error) {
cluster := newDefaultEnvoyClusterConfig() cluster := newDefaultEnvoyClusterConfig()
cluster.DnsLookupFamily = config.GetEnvoyDNSLookupFamily(cfg.Options.DNSLookupFamily) cluster.DnsLookupFamily = config.GetEnvoyDNSLookupFamily(cfg.Options.DNSLookupFamily)
// Match the Go standard library default TCP keepalive settings.
const keepaliveTimeSeconds = 15
cluster.UpstreamConnectionOptions = &envoy_config_cluster_v3.UpstreamConnectionOptions{ cluster.UpstreamConnectionOptions = &envoy_config_cluster_v3.UpstreamConnectionOptions{
// Enable TCP keepalive with OS default settings. TcpKeepalive: &envoy_config_core_v3.TcpKeepalive{
TcpKeepalive: &envoy_config_core_v3.TcpKeepalive{}, KeepaliveTime: wrapperspb.UInt32(keepaliveTimeSeconds),
KeepaliveInterval: wrapperspb.UInt32(keepaliveTimeSeconds),
},
} }
var endpoints []Endpoint var endpoints []Endpoint
for _, dst := range dsts { for _, dst := range dsts {

25
config/envoyconfig/testdata/clusters.json vendored
View file

@ -62,7 +62,10 @@
} }
}, },
"upstreamConnectionOptions": { "upstreamConnectionOptions": {
"tcpKeepalive": {} "tcpKeepalive": {
"keepaliveInterval": 15,
"keepaliveTime": 15
}
} }
}, },
{ {
@ -110,7 +113,10 @@
} }
}, },
"upstreamConnectionOptions": { "upstreamConnectionOptions": {
"tcpKeepalive": {} "tcpKeepalive": {
"keepaliveInterval": 15,
"keepaliveTime": 15
}
} }
}, },
{ {
@ -158,7 +164,10 @@
} }
}, },
"upstreamConnectionOptions": { "upstreamConnectionOptions": {
"tcpKeepalive": {} "tcpKeepalive": {
"keepaliveInterval": 15,
"keepaliveTime": 15
}
} }
}, },
{ {
@ -202,7 +211,10 @@
} }
}, },
"upstreamConnectionOptions": { "upstreamConnectionOptions": {
"tcpKeepalive": {} "tcpKeepalive": {
"keepaliveInterval": 15,
"keepaliveTime": 15
}
} }
}, },
{ {
@ -246,7 +258,10 @@
} }
}, },
"upstreamConnectionOptions": { "upstreamConnectionOptions": {
"tcpKeepalive": {} "tcpKeepalive": {
"keepaliveInterval": 15,
"keepaliveTime": 15
}
} }
}, },
{ {