Skip to content

Commit 35eaa03

Browse files
zhaohuabingzhaohuabing
authored
Merge branch 'main' into crds-toggle
Signed-off-by: Huabing (Robin) Zhao <zhaohuabing@gmail.com>
2 parents f898042 + 139de99 commit 35eaa03

53 files changed

Lines changed: 792 additions & 96 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎api/v1alpha1/clienttrafficpolicy_types.go‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -327,6 +327,14 @@ type XForwardedForSettings struct {
327327
// +optional
328328
// +kubebuilder:validation:MinItems=1
329329
TrustedCIDRs []CIDR `json:"trustedCIDRs,omitempty"`
330+
331+
// DisableXForwardedForAppend configures Envoy Proxy to stop appending the downstream address
332+
// to the X-Forwarded-For header.
333+
//
334+
// This only disables the automatic append behavior. It does not remove or sanitize
335+
// an incoming X-Forwarded-For header.
336+
// +optional
337+
DisableXForwardedForAppend *bool `json:"disableXForwardedForAppend,omitempty"`
330338
}
331339

332340
// CustomHeaderExtensionSettings provides configuration for determining the client IP address for a request based on

‎api/v1alpha1/jwt_types.go‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,15 @@ type RemoteJWKS struct {
115115
// +kubebuilder:default="300s"
116116
// +optional
117117
CacheDuration *gwapiv1.Duration `json:"cacheDuration,omitempty"`
118+
119+
// FailedRefetchDuration is the duration Envoy waits before re-fetching the JWKS
120+
// after a failed fetch.
121+
// This does not control retries within a single fetch attempt (see BackendSettings.Retry),
122+
// only the interval between fetch attempts after a failure.
123+
// If not specified, Envoy's default of 1 second is used.
124+
//
125+
// +optional
126+
FailedRefetchDuration *gwapiv1.Duration `json:"failedRefetchDuration,omitempty"`
118127
}
119128

120129
// LocalJWKSType defines the types of values for Local JWKS.

‎api/v1alpha1/lua_types.go‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,10 @@
55

66
package v1alpha1
77

8-
import gwapiv1 "sigs.k8s.io/gateway-api/apis/v1"
8+
import (
9+
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
10+
gwapiv1 "sigs.k8s.io/gateway-api/apis/v1"
11+
)
912

1013
// LuaValueType defines the types of values for Lua supported by Envoy Gateway.
1114
// +kubebuilder:validation:Enum=Inline;ValueRef
@@ -45,4 +48,11 @@ type Lua struct {
4548
// +optional
4649
// +unionMember
4750
ValueRef *gwapiv1.LocalObjectReference `json:"valueRef,omitempty"`
51+
// FilterContext is the filter context configuration for the Lua script.
52+
// This must be a JSON object (key/value pairs). The values are made available
53+
// to the Lua script via request_handle:filterContext(). This allows a shared
54+
// script to be parameterized differently per EnvoyExtensionPolicy/route.
55+
//
56+
// +optional
57+
FilterContext *apiextensionsv1.JSON `json:"filterContext,omitempty"`
4858
}

‎api/v1alpha1/zz_generated.deepcopy.go‎

Lines changed: 15 additions & 0 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: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,14 @@ spec:
8282
using X-Forwarded-For headers for determining the client IP
8383
address.
8484
properties:
85+
disableXForwardedForAppend:
86+
description: |-
87+
DisableXForwardedForAppend configures Envoy Proxy to stop appending the downstream address
88+
to the X-Forwarded-For header.
89+
90+
This only disables the automatic append behavior. It does not remove or sanitize
91+
an incoming X-Forwarded-For header.
92+
type: boolean
8593
numTrustedHops:
8694
description: |-
8795
NumTrustedHops specifies how many trusted hops to count from the rightmost side of

‎charts/gateway-crds-helm/templates/generated/gateway.envoyproxy.io_envoyextensionpolicies.yaml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1641,6 +1641,13 @@ spec:
16411641
Lua defines a Lua extension
16421642
Only one of Inline or ValueRef must be set
16431643
properties:
1644+
filterContext:
1645+
description: |-
1646+
FilterContext is the filter context configuration for the Lua script.
1647+
This must be a JSON object (key/value pairs). The values are made available
1648+
to the Lua script via request_handle:filterContext(). This allows a shared
1649+
script to be parameterized differently per EnvoyExtensionPolicy/route.
1650+
x-kubernetes-preserve-unknown-fields: true
16441651
inline:
16451652
description: Inline contains the source code as an inline string.
16461653
type: string

‎charts/gateway-crds-helm/templates/generated/gateway.envoyproxy.io_securitypolicies.yaml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5369,6 +5369,15 @@ spec:
53695369
in GEP-2257, a strict subset of the syntax parsed by Golang time.ParseDuration.
53705370
pattern: ^([0-9]{1,5}(h|m|s|ms)){1,4}$
53715371
type: string
5372+
failedRefetchDuration:
5373+
description: |-
5374+
FailedRefetchDuration is the duration Envoy waits before re-fetching the JWKS
5375+
after a failed fetch.
5376+
This does not control retries within a single fetch attempt (see BackendSettings.Retry),
5377+
only the interval between fetch attempts after a failure.
5378+
If not specified, Envoy's default of 1 second is used.
5379+
pattern: ^([0-9]{1,5}(h|m|s|ms)){1,4}$
5380+
type: string
53725381
uri:
53735382
description: |-
53745383
URI is the HTTPS URI to fetch the JWKS. Envoy's system trust bundle is used to validate the server certificate.

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,14 @@ spec:
8181
using X-Forwarded-For headers for determining the client IP
8282
address.
8383
properties:
84+
disableXForwardedForAppend:
85+
description: |-
86+
DisableXForwardedForAppend configures Envoy Proxy to stop appending the downstream address
87+
to the X-Forwarded-For header.
88+
89+
This only disables the automatic append behavior. It does not remove or sanitize
90+
an incoming X-Forwarded-For header.
91+
type: boolean
8492
numTrustedHops:
8593
description: |-
8694
NumTrustedHops specifies how many trusted hops to count from the rightmost side of

‎charts/gateway-helm/charts/crds/crds/generated/gateway.envoyproxy.io_envoyextensionpolicies.yaml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1640,6 +1640,13 @@ spec:
16401640
Lua defines a Lua extension
16411641
Only one of Inline or ValueRef must be set
16421642
properties:
1643+
filterContext:
1644+
description: |-
1645+
FilterContext is the filter context configuration for the Lua script.
1646+
This must be a JSON object (key/value pairs). The values are made available
1647+
to the Lua script via request_handle:filterContext(). This allows a shared
1648+
script to be parameterized differently per EnvoyExtensionPolicy/route.
1649+
x-kubernetes-preserve-unknown-fields: true
16431650
inline:
16441651
description: Inline contains the source code as an inline string.
16451652
type: string

‎charts/gateway-helm/charts/crds/crds/generated/gateway.envoyproxy.io_securitypolicies.yaml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5368,6 +5368,15 @@ spec:
53685368
in GEP-2257, a strict subset of the syntax parsed by Golang time.ParseDuration.
53695369
pattern: ^([0-9]{1,5}(h|m|s|ms)){1,4}$
53705370
type: string
5371+
failedRefetchDuration:
5372+
description: |-
5373+
FailedRefetchDuration is the duration Envoy waits before re-fetching the JWKS
5374+
after a failed fetch.
5375+
This does not control retries within a single fetch attempt (see BackendSettings.Retry),
5376+
only the interval between fetch attempts after a failure.
5377+
If not specified, Envoy's default of 1 second is used.
5378+
pattern: ^([0-9]{1,5}(h|m|s|ms)){1,4}$
5379+
type: string
53715380
uri:
53725381
description: |-
53735382
URI is the HTTPS URI to fetch the JWKS. Envoy's system trust bundle is used to validate the server certificate.

0 commit comments

Comments
 (0)