Skip to content

Commit 96aec06

Browse files
author
kabbohus
committed
Make naming less envoy specific
Signed-off-by: kabbohus <hussein.kabbout@united-security-providers.ch>
1 parent 973a1b4 commit 96aec06

9 files changed

Lines changed: 125 additions & 115 deletions

File tree

api/v1alpha1/timeout_types.go

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -72,13 +72,13 @@ type ClientTimeout struct {
7272
// +optional
7373
HTTP *HTTPClientTimeout `json:"http,omitempty"`
7474

75-
// ListenerFiltersTimeout is the duration envoy waits for all listener filters to complete operation.
76-
// If the timeout is reached, the accepted socket is closed without a connection being created.
77-
// Specify 0 to disable the timeout.
75+
// ConnectionInspectionTimeout is the maximum time to wait for initial inspection
76+
// (TLS / SNI and protocol detection, or HTTP protocol parsing) of an incoming connection.
77+
// If exceeded, the connection is dropped.
7878
// Default: 15 seconds.
7979
//
8080
// +optional
81-
ListenerFiltersTimeout *gwapiv1.Duration `json:"listenerFiltersTimeout,omitempty"`
81+
ConnectionInspectionTimeout *gwapiv1.Duration `json:"connectionInspectionTimeout,omitempty"`
8282
}
8383

8484
// TCPClientTimeout only provides timeout configuration on the listener whose protocol is TCP or TLS.
@@ -90,12 +90,13 @@ type TCPClientTimeout struct {
9090
// +optional
9191
IdleTimeout *gwapiv1.Duration `json:"idleTimeout,omitempty"`
9292

93-
// TransportSocketConnectTimeout is the duration envoy waits for incoming connections to complete any transport socket negotiations.
93+
// HandshakeTimeout for a TCP connection. The maximum time to complete transport level connection negotiation
94+
// (e.g. the TLS handshake) after a connection is accepted.
9495
// If this expires before the transport reports connection establishment, the connection is summarily closed.
9596
// Default: 5 seconds.
9697
//
9798
// +optional
98-
TransportSocketConnectTimeout *gwapiv1.Duration `json:"transportSocketConnectTimeout,omitempty"`
99+
HandshakeTimeout *gwapiv1.Duration `json:"handshakeTimeout,omitempty"`
99100
}
100101

101102
type HTTPClientTimeout struct {
@@ -105,6 +106,15 @@ type HTTPClientTimeout struct {
105106
// +optional
106107
RequestReceivedTimeout *gwapiv1.Duration `json:"requestReceivedTimeout,omitempty"`
107108

109+
// RequestHeadersReceivedTimeout is the duration envoy waits for the request headers to arrive.
110+
// The timer is activated when the first byte of the headers is received,
111+
// and is disarmed when the last byte of the headers has been received.
112+
// Specify 0 to disable the timeout.
113+
// Default: 10 seconds.
114+
//
115+
// +optional
116+
RequestHeadersReceivedTimeout *gwapiv1.Duration `json:"requestHeadersReceivedTimeout,omitempty"`
117+
108118
// IdleTimeout for an HTTP connection. Idle time is defined as a period in which there are no active requests in the connection.
109119
// Default: 1 hour.
110120
//
@@ -116,13 +126,4 @@ type HTTPClientTimeout struct {
116126
//
117127
// +optional
118128
StreamIdleTimeout *gwapiv1.Duration `json:"streamIdleTimeout,omitempty"`
119-
120-
// RequestHeadersTimeout is the duration envoy waits for the request headers to arrive.
121-
// The timer is activated when the first byte of the headers is received,
122-
// and is disarmed when the last byte of the headers has been received.
123-
// Specify 0 to disable the timeout.
124-
// Default: 10 seconds.
125-
//
126-
// +optional
127-
RequestHeadersTimeout *gwapiv1.Duration `json:"requestHeadersTimeout,omitempty"`
128129
}

api/v1alpha1/zz_generated.deepcopy.go

Lines changed: 9 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

charts/gateway-crds-helm/templates/generated/gateway.envoyproxy.io_clienttrafficpolicies.yaml

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1327,6 +1327,14 @@ spec:
13271327
timeout:
13281328
description: Timeout settings for the client connections.
13291329
properties:
1330+
connectionInspectionTimeout:
1331+
description: |-
1332+
ConnectionInspectionTimeout is the maximum time to wait for initial inspection
1333+
(TLS / SNI and protocol detection, or HTTP protocol parsing) of an incoming connection.
1334+
If exceeded, the connection is dropped.
1335+
Default: 15 seconds.
1336+
pattern: ^([0-9]{1,5}(h|m|s|ms)){1,4}$
1337+
type: string
13301338
http:
13311339
description: Timeout settings for HTTP.
13321340
properties:
@@ -1336,9 +1344,9 @@ spec:
13361344
Default: 1 hour.
13371345
pattern: ^([0-9]{1,5}(h|m|s|ms)){1,4}$
13381346
type: string
1339-
requestHeadersTimeout:
1347+
requestHeadersReceivedTimeout:
13401348
description: |-
1341-
RequestHeadersTimeout is the duration envoy waits for the request headers to arrive.
1349+
RequestHeadersReceivedTimeout is the duration envoy waits for the request headers to arrive.
13421350
The timer is activated when the first byte of the headers is received,
13431351
and is disarmed when the last byte of the headers has been received.
13441352
Specify 0 to disable the timeout.
@@ -1358,31 +1366,24 @@ spec:
13581366
pattern: ^([0-9]{1,5}(h|m|s|ms)){1,4}$
13591367
type: string
13601368
type: object
1361-
listenerFiltersTimeout:
1362-
description: |-
1363-
ListenerFiltersTimeout is the duration envoy waits for all listener filters to complete operation.
1364-
If the timeout is reached, the accepted socket is closed without a connection being created.
1365-
Specify 0 to disable the timeout.
1366-
Default: 15 seconds.
1367-
pattern: ^([0-9]{1,5}(h|m|s|ms)){1,4}$
1368-
type: string
13691369
tcp:
13701370
description: Timeout settings for TCP.
13711371
properties:
1372+
handshakeTimeout:
1373+
description: |-
1374+
HandshakeTimeout for a TCP connection. The maximum time to complete transport level connection negotiation
1375+
(e.g. the TLS handshake) after a connection is accepted.
1376+
If this expires before the transport reports connection establishment, the connection is summarily closed.
1377+
Default: 5 seconds.
1378+
pattern: ^([0-9]{1,5}(h|m|s|ms)){1,4}$
1379+
type: string
13721380
idleTimeout:
13731381
description: |-
13741382
IdleTimeout for a TCP connection. Idle time is defined as a period in which there are no
13751383
bytes sent or received on either the upstream or downstream connection.
13761384
Default: 1 hour.
13771385
pattern: ^([0-9]{1,5}(h|m|s|ms)){1,4}$
13781386
type: string
1379-
transportSocketConnectTimeout:
1380-
description: |-
1381-
TransportSocketConnectTimeout is the duration envoy waits for incoming connections to complete any transport socket negotiations.
1382-
If this expires before the transport reports connection establishment, the connection is summarily closed.
1383-
Default: 5 seconds.
1384-
pattern: ^([0-9]{1,5}(h|m|s|ms)){1,4}$
1385-
type: string
13861387
type: object
13871388
type: object
13881389
tls:

charts/gateway-helm/charts/crds/crds/generated/gateway.envoyproxy.io_clienttrafficpolicies.yaml

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1326,6 +1326,14 @@ spec:
13261326
timeout:
13271327
description: Timeout settings for the client connections.
13281328
properties:
1329+
connectionInspectionTimeout:
1330+
description: |-
1331+
ConnectionInspectionTimeout is the maximum time to wait for initial inspection
1332+
(TLS / SNI and protocol detection, or HTTP protocol parsing) of an incoming connection.
1333+
If exceeded, the connection is dropped.
1334+
Default: 15 seconds.
1335+
pattern: ^([0-9]{1,5}(h|m|s|ms)){1,4}$
1336+
type: string
13291337
http:
13301338
description: Timeout settings for HTTP.
13311339
properties:
@@ -1335,9 +1343,9 @@ spec:
13351343
Default: 1 hour.
13361344
pattern: ^([0-9]{1,5}(h|m|s|ms)){1,4}$
13371345
type: string
1338-
requestHeadersTimeout:
1346+
requestHeadersReceivedTimeout:
13391347
description: |-
1340-
RequestHeadersTimeout is the duration envoy waits for the request headers to arrive.
1348+
RequestHeadersReceivedTimeout is the duration envoy waits for the request headers to arrive.
13411349
The timer is activated when the first byte of the headers is received,
13421350
and is disarmed when the last byte of the headers has been received.
13431351
Specify 0 to disable the timeout.
@@ -1357,31 +1365,24 @@ spec:
13571365
pattern: ^([0-9]{1,5}(h|m|s|ms)){1,4}$
13581366
type: string
13591367
type: object
1360-
listenerFiltersTimeout:
1361-
description: |-
1362-
ListenerFiltersTimeout is the duration envoy waits for all listener filters to complete operation.
1363-
If the timeout is reached, the accepted socket is closed without a connection being created.
1364-
Specify 0 to disable the timeout.
1365-
Default: 15 seconds.
1366-
pattern: ^([0-9]{1,5}(h|m|s|ms)){1,4}$
1367-
type: string
13681368
tcp:
13691369
description: Timeout settings for TCP.
13701370
properties:
1371+
handshakeTimeout:
1372+
description: |-
1373+
HandshakeTimeout for a TCP connection. The maximum time to complete transport level connection negotiation
1374+
(e.g. the TLS handshake) after a connection is accepted.
1375+
If this expires before the transport reports connection establishment, the connection is summarily closed.
1376+
Default: 5 seconds.
1377+
pattern: ^([0-9]{1,5}(h|m|s|ms)){1,4}$
1378+
type: string
13711379
idleTimeout:
13721380
description: |-
13731381
IdleTimeout for a TCP connection. Idle time is defined as a period in which there are no
13741382
bytes sent or received on either the upstream or downstream connection.
13751383
Default: 1 hour.
13761384
pattern: ^([0-9]{1,5}(h|m|s|ms)){1,4}$
13771385
type: string
1378-
transportSocketConnectTimeout:
1379-
description: |-
1380-
TransportSocketConnectTimeout is the duration envoy waits for incoming connections to complete any transport socket negotiations.
1381-
If this expires before the transport reports connection establishment, the connection is summarily closed.
1382-
Default: 5 seconds.
1383-
pattern: ^([0-9]{1,5}(h|m|s|ms)){1,4}$
1384-
type: string
13851386
type: object
13861387
type: object
13871388
tls:

internal/xds/translator/testdata/out/xds-ir/jwt-allow-missing-or-failed.clusters.yaml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,16 @@
4747
- circuitBreakers:
4848
thresholds:
4949
- maxRetries: 1024
50+
clusterType:
51+
name: envoy.cluster.dns
52+
typedConfig:
53+
'@type': type.googleapis.com/envoy.extensions.clusters.dns.v3.DnsCluster
54+
dnsLookupFamily: V4_PREFERRED
55+
dnsRefreshRate: 30s
56+
respectDnsTtl: true
5057
commonLbConfig: {}
5158
connectTimeout: 10s
5259
dnsLookupFamily: V4_PREFERRED
53-
dnsRefreshRate: 30s
5460
ignoreHealthOnHostRemoval: true
5561
loadAssignment:
5662
clusterName: localhost_443
@@ -75,7 +81,6 @@
7581
localityWeightedLbConfig: {}
7682
name: localhost_443
7783
perConnectionBufferLimitBytes: 32768
78-
respectDnsTtl: true
7984
transportSocket:
8085
name: envoy.transport_sockets.tls
8186
typedConfig:
@@ -85,4 +90,3 @@
8590
trustedCa:
8691
filename: /etc/ssl/certs/ca-certificates.crt
8792
sni: localhost
88-
type: STRICT_DNS

site/content/en/latest/api/extension_types.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -961,7 +961,7 @@ _Appears in:_
961961
| --- | --- | --- | --- | --- |
962962
| `tcp` | _[TCPClientTimeout](#tcpclienttimeout)_ | false | | Timeout settings for TCP. |
963963
| `http` | _[HTTPClientTimeout](#httpclienttimeout)_ | false | | Timeout settings for HTTP. |
964-
| `listenerFiltersTimeout` | _[Duration](https://gateway-api.sigs.k8s.io/reference/api-spec/1.5/spec/#duration)_ | false | | ListenerFiltersTimeout is the duration envoy waits for all listener filters to complete operation.<br />If the timeout is reached, the accepted socket is closed without a connection being created.<br />Specify 0 to disable the timeout.<br />Default: 15 seconds. |
964+
| `connectionInspectionTimeout` | _[Duration](https://gateway-api.sigs.k8s.io/reference/api-spec/1.5/spec/#duration)_ | false | | ConnectionInspectionTimeout is the maximum time to wait for initial inspection<br />(TLS / SNI and protocol detection, or HTTP protocol parsing) of an incoming connection.<br />If exceeded, the connection is dropped.<br />Default: 15 seconds. |
965965

966966

967967
#### ClientTrafficPolicy
@@ -2997,9 +2997,9 @@ _Appears in:_
29972997
| Field | Type | Required | Default | Description |
29982998
| --- | --- | --- | --- | --- |
29992999
| `requestReceivedTimeout` | _[Duration](https://gateway-api.sigs.k8s.io/reference/api-spec/1.5/spec/#duration)_ | false | | RequestReceivedTimeout is the duration envoy waits for the complete request reception. This timer starts upon request<br />initiation and stops when either the last byte of the request is sent upstream or when the response begins. |
3000+
| `requestHeadersReceivedTimeout` | _[Duration](https://gateway-api.sigs.k8s.io/reference/api-spec/1.5/spec/#duration)_ | false | | RequestHeadersReceivedTimeout is the duration envoy waits for the request headers to arrive.<br />The timer is activated when the first byte of the headers is received,<br />and is disarmed when the last byte of the headers has been received.<br />Specify 0 to disable the timeout.<br />Default: 10 seconds. |
30003001
| `idleTimeout` | _[Duration](https://gateway-api.sigs.k8s.io/reference/api-spec/1.5/spec/#duration)_ | false | | IdleTimeout for an HTTP connection. Idle time is defined as a period in which there are no active requests in the connection.<br />Default: 1 hour. |
30013002
| `streamIdleTimeout` | _[Duration](https://gateway-api.sigs.k8s.io/reference/api-spec/1.5/spec/#duration)_ | false | | The stream idle timeout defines the amount of time a stream can exist without any upstream or downstream activity.<br /> Default: 5 minutes. |
3002-
| `requestHeadersTimeout` | _[Duration](https://gateway-api.sigs.k8s.io/reference/api-spec/1.5/spec/#duration)_ | false | | RequestHeadersTimeout is the duration envoy waits for the request headers to arrive.<br />The timer is activated when the first byte of the headers is received,<br />and is disarmed when the last byte of the headers has been received.<br />Specify 0 to disable the timeout.<br />Default: 10 seconds. |
30033003

30043004

30053005
#### HTTPCookieMatch
@@ -6164,7 +6164,7 @@ _Appears in:_
61646164
| Field | Type | Required | Default | Description |
61656165
| --- | --- | --- | --- | --- |
61666166
| `idleTimeout` | _[Duration](https://gateway-api.sigs.k8s.io/reference/api-spec/1.5/spec/#duration)_ | false | | IdleTimeout for a TCP connection. Idle time is defined as a period in which there are no<br />bytes sent or received on either the upstream or downstream connection.<br />Default: 1 hour. |
6167-
| `transportSocketConnectTimeout` | _[Duration](https://gateway-api.sigs.k8s.io/reference/api-spec/1.5/spec/#duration)_ | false | | TransportSocketConnectTimeout is the duration envoy waits for incoming connections to complete any transport socket negotiations.<br />If this expires before the transport reports connection establishment, the connection is summarily closed.<br />Default: 5 seconds. |
6167+
| `handshakeTimeout` | _[Duration](https://gateway-api.sigs.k8s.io/reference/api-spec/1.5/spec/#duration)_ | false | | HandshakeTimeout for a TCP connection. The maximum time to complete transport level connection negotiation<br />(e.g. the TLS handshake) after a connection is accepted.<br />If this expires before the transport reports connection establishment, the connection is summarily closed.<br />Default: 5 seconds. |
61686168

61696169

61706170
#### TCPKeepalive

0 commit comments

Comments
 (0)