Skip to content

Commit bd2f863

Browse files
authored
Merge branch 'main' into route-overlap
2 parents 5acc84b + fa31928 commit bd2f863

64 files changed

Lines changed: 615 additions & 594 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/backendtrafficpolicy_types.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ type BackendTrafficPolicySpec struct {
7777
UseClientProtocol *bool `json:"useClientProtocol,omitempty"`
7878

7979
// The compression config for the http streams.
80+
//
8081
// Deprecated: Use Compressor instead.
8182
//
8283
// +patchMergeKey=type

api/v1alpha1/clienttrafficpolicy_types.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,7 @@ type HeaderSettings struct {
159159
// PreserveXRequestID configures Envoy to keep the X-Request-ID header if passed for a request that is edge
160160
// (Edge request is the request from external clients to front Envoy) and not reset it, which is the current Envoy behaviour.
161161
// Defaults to false and cannot be combined with RequestID.
162+
//
162163
// Deprecated: use RequestID=PreserveOrGenerate instead
163164
//
164165
// +optional

api/v1alpha1/envoygateway_types.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -785,12 +785,14 @@ type ExtensionService struct {
785785
BackendEndpoint `json:",inline"`
786786

787787
// Host define the extension service hostname.
788+
//
788789
// Deprecated: use the appropriate transport attribute instead (FQDN,IP,Unix)
789790
//
790791
// +optional
791792
Host string `json:"host,omitempty"`
792793

793794
// Port defines the port the extension service is exposed on.
795+
//
794796
// Deprecated: use the appropriate transport attribute instead (FQDN,IP,Unix)
795797
//
796798
// +optional

api/v1alpha1/envoyproxy_accesslogging_types.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -199,11 +199,13 @@ type FileEnvoyProxyAccessLog struct {
199199
type OpenTelemetryEnvoyProxyAccessLog struct {
200200
BackendCluster `json:",inline"`
201201
// Host define the extension service hostname.
202+
//
202203
// Deprecated: Use BackendRefs instead.
203204
//
204205
// +optional
205206
Host *string `json:"host,omitempty"`
206207
// Port defines the port the extension service is exposed on.
208+
//
207209
// Deprecated: Use BackendRefs instead.
208210
//
209211
// +optional

api/v1alpha1/envoyproxy_metric_types.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,11 +97,13 @@ type ProxyMetricSink struct {
9797
type ProxyOpenTelemetrySink struct {
9898
BackendCluster `json:",inline"`
9999
// Host define the service hostname.
100+
//
100101
// Deprecated: Use BackendRefs instead.
101102
//
102103
// +optional
103104
Host *string `json:"host,omitempty"`
104105
// Port defines the port the service is exposed on.
106+
//
105107
// Deprecated: Use BackendRefs instead.
106108
//
107109
// +optional

api/v1alpha1/envoyproxy_tracing_types.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,13 @@ type TracingProvider struct {
4848
// +kubebuilder:default=OpenTelemetry
4949
Type TracingProviderType `json:"type"`
5050
// Host define the provider service hostname.
51+
//
5152
// Deprecated: Use BackendRefs instead.
5253
//
5354
// +optional
5455
Host *string `json:"host,omitempty"`
5556
// Port defines the port the provider service is exposed on.
57+
//
5658
// Deprecated: Use BackendRefs instead.
5759
//
5860
// +optional

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
44
kind: CustomResourceDefinition
55
metadata:
66
annotations:
7-
controller-gen.kubebuilder.io/version: v0.18.0
7+
controller-gen.kubebuilder.io/version: v0.20.1
88
name: backends.gateway.envoyproxy.io
99
spec:
1010
group: gateway.envoyproxy.io

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
44
kind: CustomResourceDefinition
55
metadata:
66
annotations:
7-
controller-gen.kubebuilder.io/version: v0.18.0
7+
controller-gen.kubebuilder.io/version: v0.20.1
88
name: backendtrafficpolicies.gateway.envoyproxy.io
99
spec:
1010
group: gateway.envoyproxy.io
@@ -155,6 +155,7 @@ spec:
155155
compression:
156156
description: |-
157157
The compression config for the http streams.
158+
158159
Deprecated: Use Compressor instead.
159160
items:
160161
description: |-

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
44
kind: CustomResourceDefinition
55
metadata:
66
annotations:
7-
controller-gen.kubebuilder.io/version: v0.18.0
7+
controller-gen.kubebuilder.io/version: v0.20.1
88
name: clienttrafficpolicies.gateway.envoyproxy.io
99
spec:
1010
group: gateway.envoyproxy.io
@@ -716,6 +716,7 @@ spec:
716716
PreserveXRequestID configures Envoy to keep the X-Request-ID header if passed for a request that is edge
717717
(Edge request is the request from external clients to front Envoy) and not reset it, which is the current Envoy behaviour.
718718
Defaults to false and cannot be combined with RequestID.
719+
719720
Deprecated: use RequestID=PreserveOrGenerate instead
720721
type: boolean
721722
requestID:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
44
kind: CustomResourceDefinition
55
metadata:
66
annotations:
7-
controller-gen.kubebuilder.io/version: v0.18.0
7+
controller-gen.kubebuilder.io/version: v0.20.1
88
name: envoyextensionpolicies.gateway.envoyproxy.io
99
spec:
1010
group: gateway.envoyproxy.io

0 commit comments

Comments
 (0)