Skip to content

Commit 5b4c9a2

Browse files
guydcguydc
authored
Merge branch 'main' into feat-ext-proc-attributes
2 parents 5ac1412 + 4bfbebc commit 5b4c9a2

File tree

535 files changed

+1908
-915
lines changed

Some content is hidden

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

535 files changed

+1908
-915
lines changed

‎.github/workflows/trivy.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
IMAGE=envoy-proxy/gateway-dev TAG=${{ github.sha }} make image
2626
2727
- name: Run Trivy vulnerability scanner
28-
uses: aquasecurity/trivy-action@915b19bbe73b92a6cf82a1bc12b087c9a19a5fe2 # v0.28.0
28+
uses: aquasecurity/trivy-action@18f2510ee396bbf400402947b394f2dd8c87dbb0 # v0.29.0
2929
with:
3030
image-ref: envoy-proxy/gateway-dev:${{ github.sha }}
3131
exit-code: '1'

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v1.2.1
1+
v1.2.3

‎api/v1alpha1/backend_types.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ type BackendSpec struct {
116116
// Endpoints defines the endpoints to be used when connecting to the backend.
117117
//
118118
// +kubebuilder:validation:MinItems=1
119-
// +kubebuilder:validation:MaxItems=4
119+
// +kubebuilder:validation:MaxItems=64
120120
// +kubebuilder:validation:XValidation:rule="self.all(f, has(f.fqdn)) || !self.exists(f, has(f.fqdn))",message="fqdn addresses cannot be mixed with other address types"
121121
Endpoints []BackendEndpoint `json:"endpoints,omitempty"`
122122

‎charts/gateway-helm/crds/gatewayapi-crds.yaml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ kind: CustomResourceDefinition
2424
metadata:
2525
annotations:
2626
api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/3328
27-
gateway.networking.k8s.io/bundle-version: v1.2.0
27+
gateway.networking.k8s.io/bundle-version: v1.2.1
2828
gateway.networking.k8s.io/channel: experimental
2929
creationTimestamp: null
3030
labels:
@@ -525,7 +525,7 @@ kind: CustomResourceDefinition
525525
metadata:
526526
annotations:
527527
api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/3328
528-
gateway.networking.k8s.io/bundle-version: v1.2.0
528+
gateway.networking.k8s.io/bundle-version: v1.2.1
529529
gateway.networking.k8s.io/channel: experimental
530530
creationTimestamp: null
531531
labels:
@@ -1154,7 +1154,7 @@ kind: CustomResourceDefinition
11541154
metadata:
11551155
annotations:
11561156
api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/3328
1157-
gateway.networking.k8s.io/bundle-version: v1.2.0
1157+
gateway.networking.k8s.io/bundle-version: v1.2.1
11581158
gateway.networking.k8s.io/channel: experimental
11591159
creationTimestamp: null
11601160
name: gatewayclasses.gateway.networking.k8s.io
@@ -1674,7 +1674,7 @@ kind: CustomResourceDefinition
16741674
metadata:
16751675
annotations:
16761676
api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/3328
1677-
gateway.networking.k8s.io/bundle-version: v1.2.0
1677+
gateway.networking.k8s.io/bundle-version: v1.2.1
16781678
gateway.networking.k8s.io/channel: experimental
16791679
creationTimestamp: null
16801680
name: gateways.gateway.networking.k8s.io
@@ -4090,7 +4090,7 @@ kind: CustomResourceDefinition
40904090
metadata:
40914091
annotations:
40924092
api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/3328
4093-
gateway.networking.k8s.io/bundle-version: v1.2.0
4093+
gateway.networking.k8s.io/bundle-version: v1.2.1
40944094
gateway.networking.k8s.io/channel: experimental
40954095
creationTimestamp: null
40964096
name: grpcroutes.gateway.networking.k8s.io
@@ -6328,7 +6328,7 @@ kind: CustomResourceDefinition
63286328
metadata:
63296329
annotations:
63306330
api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/3328
6331-
gateway.networking.k8s.io/bundle-version: v1.2.0
6331+
gateway.networking.k8s.io/bundle-version: v1.2.1
63326332
gateway.networking.k8s.io/channel: experimental
63336333
creationTimestamp: null
63346334
name: httproutes.gateway.networking.k8s.io
@@ -12490,7 +12490,7 @@ kind: CustomResourceDefinition
1249012490
metadata:
1249112491
annotations:
1249212492
api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/3328
12493-
gateway.networking.k8s.io/bundle-version: v1.2.0
12493+
gateway.networking.k8s.io/bundle-version: v1.2.1
1249412494
gateway.networking.k8s.io/channel: experimental
1249512495
creationTimestamp: null
1249612496
name: referencegrants.gateway.networking.k8s.io
@@ -12683,7 +12683,7 @@ kind: CustomResourceDefinition
1268312683
metadata:
1268412684
annotations:
1268512685
api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/3328
12686-
gateway.networking.k8s.io/bundle-version: v1.2.0
12686+
gateway.networking.k8s.io/bundle-version: v1.2.1
1268712687
gateway.networking.k8s.io/channel: experimental
1268812688
creationTimestamp: null
1268912689
name: tcproutes.gateway.networking.k8s.io
@@ -13428,7 +13428,7 @@ kind: CustomResourceDefinition
1342813428
metadata:
1342913429
annotations:
1343013430
api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/3328
13431-
gateway.networking.k8s.io/bundle-version: v1.2.0
13431+
gateway.networking.k8s.io/bundle-version: v1.2.1
1343213432
gateway.networking.k8s.io/channel: experimental
1343313433
creationTimestamp: null
1343413434
name: tlsroutes.gateway.networking.k8s.io
@@ -14236,7 +14236,7 @@ kind: CustomResourceDefinition
1423614236
metadata:
1423714237
annotations:
1423814238
api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/3328
14239-
gateway.networking.k8s.io/bundle-version: v1.2.0
14239+
gateway.networking.k8s.io/bundle-version: v1.2.1
1424014240
gateway.networking.k8s.io/channel: experimental
1424114241
creationTimestamp: null
1424214242
name: udproutes.gateway.networking.k8s.io

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ spec:
132132
rule: ((has(self.fqdn) && !(has(self.ip) || has(self.unix))) ||
133133
(has(self.ip) && !(has(self.fqdn) || has(self.unix))) || (has(self.unix)
134134
&& !(has(self.ip) || has(self.fqdn))))
135-
maxItems: 4
135+
maxItems: 64
136136
minItems: 1
137137
type: array
138138
x-kubernetes-validations:

‎examples/extension-server/go.mod‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ require (
88
github.com/urfave/cli/v2 v2.27.5
99
google.golang.org/grpc v1.68.0
1010
google.golang.org/protobuf v1.35.2
11-
k8s.io/apimachinery v0.31.2
12-
sigs.k8s.io/controller-runtime v0.19.1
13-
sigs.k8s.io/gateway-api v1.2.0
11+
k8s.io/apimachinery v0.31.3
12+
sigs.k8s.io/controller-runtime v0.19.2
13+
sigs.k8s.io/gateway-api v1.2.1
1414
)
1515

1616
require (

‎examples/extension-server/go.sum‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
6464
github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
6565
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
6666
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
67-
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
68-
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
67+
github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
68+
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
6969
github.com/urfave/cli/v2 v2.27.5 h1:WoHEJLdsXr6dDWoJgMq/CboDmyY/8HMMH1fTECbih+w=
7070
github.com/urfave/cli/v2 v2.27.5/go.mod h1:3Sevf16NykTbInEnD0yKkjDAeZDS0A6bzhBH5hrMvTQ=
7171
github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
@@ -125,18 +125,18 @@ gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
125125
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
126126
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
127127
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
128-
k8s.io/api v0.31.2 h1:3wLBbL5Uom/8Zy98GRPXpJ254nEFpl+hwndmk9RwmL0=
129-
k8s.io/api v0.31.2/go.mod h1:bWmGvrGPssSK1ljmLzd3pwCQ9MgoTsRCuK35u6SygUk=
130-
k8s.io/apimachinery v0.31.2 h1:i4vUt2hPK56W6mlT7Ry+AO8eEsyxMD1U44NR22CLTYw=
131-
k8s.io/apimachinery v0.31.2/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo=
128+
k8s.io/api v0.31.3 h1:umzm5o8lFbdN/hIXbrK9oRpOproJO62CV1zqxXrLgk8=
129+
k8s.io/api v0.31.3/go.mod h1:UJrkIp9pnMOI9K2nlL6vwpxRzzEX5sWgn8kGQe92kCE=
130+
k8s.io/apimachinery v0.31.3 h1:6l0WhcYgasZ/wk9ktLq5vLaoXJJr5ts6lkaQzgeYPq4=
131+
k8s.io/apimachinery v0.31.3/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo=
132132
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
133133
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
134134
k8s.io/utils v0.0.0-20240821151609-f90d01438635 h1:2wThSvJoW/Ncn9TmQEYXRnevZXi2duqHWf5OX9S3zjI=
135135
k8s.io/utils v0.0.0-20240821151609-f90d01438635/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
136-
sigs.k8s.io/controller-runtime v0.19.1 h1:Son+Q40+Be3QWb+niBXAg2vFiYWolDjjRfO8hn/cxOk=
137-
sigs.k8s.io/controller-runtime v0.19.1/go.mod h1:iRmWllt8IlaLjvTTDLhRBXIEtkCK6hwVBJJsYS9Ajf4=
138-
sigs.k8s.io/gateway-api v1.2.0 h1:LrToiFwtqKTKZcZtoQPTuo3FxhrrhTgzQG0Te+YGSo8=
139-
sigs.k8s.io/gateway-api v1.2.0/go.mod h1:EpNfEXNjiYfUJypf0eZ0P5iXA9ekSGWaS1WgPaM42X0=
136+
sigs.k8s.io/controller-runtime v0.19.2 h1:3sPrF58XQEPzbE8T81TN6selQIMGbtYwuaJ6eDssDF8=
137+
sigs.k8s.io/controller-runtime v0.19.2/go.mod h1:iRmWllt8IlaLjvTTDLhRBXIEtkCK6hwVBJJsYS9Ajf4=
138+
sigs.k8s.io/gateway-api v1.2.1 h1:fZZ/+RyRb+Y5tGkwxFKuYuSRQHu9dZtbjenblleOLHM=
139+
sigs.k8s.io/gateway-api v1.2.1/go.mod h1:EpNfEXNjiYfUJypf0eZ0P5iXA9ekSGWaS1WgPaM42X0=
140140
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
141141
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
142142
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4=

‎go.mod‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ require (
3131
github.com/prometheus/common v0.60.1
3232
github.com/spf13/cobra v1.8.1
3333
github.com/spf13/pflag v1.0.5
34-
github.com/stretchr/testify v1.9.0
34+
github.com/stretchr/testify v1.10.0
3535
github.com/telepresenceio/watchable v0.0.0-20220726211108-9bb86f92afa7
3636
github.com/tsaarni/certyaml v0.10.0
3737
go.opentelemetry.io/otel v1.32.0
@@ -48,15 +48,15 @@ require (
4848
google.golang.org/protobuf v1.35.2
4949
gopkg.in/yaml.v3 v3.0.1
5050
helm.sh/helm/v3 v3.16.3
51-
k8s.io/api v0.31.2
52-
k8s.io/apiextensions-apiserver v0.31.2
53-
k8s.io/apimachinery v0.31.2
54-
k8s.io/cli-runtime v0.31.2
55-
k8s.io/client-go v0.31.2
56-
k8s.io/kubectl v0.31.2
51+
k8s.io/api v0.31.3
52+
k8s.io/apiextensions-apiserver v0.31.3
53+
k8s.io/apimachinery v0.31.3
54+
k8s.io/cli-runtime v0.31.3
55+
k8s.io/client-go v0.31.3
56+
k8s.io/kubectl v0.31.3
5757
k8s.io/utils v0.0.0-20240821151609-f90d01438635
58-
sigs.k8s.io/controller-runtime v0.19.1
59-
sigs.k8s.io/gateway-api v1.2.0
58+
sigs.k8s.io/controller-runtime v0.19.2
59+
sigs.k8s.io/gateway-api v1.2.1
6060
sigs.k8s.io/mcs-api v0.1.0
6161
sigs.k8s.io/yaml v1.4.0
6262
)
@@ -212,8 +212,8 @@ require (
212212
golang.org/x/crypto/x509roots/fallback v0.0.0-20240904212608-c9da6b9a4008 // indirect
213213
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
214214
gopkg.in/ini.v1 v1.67.0 // indirect
215-
k8s.io/apiserver v0.31.2 // indirect
216-
k8s.io/metrics v0.31.2 // indirect
215+
k8s.io/apiserver v0.31.3 // indirect
216+
k8s.io/metrics v0.31.3 // indirect
217217
oras.land/oras-go v1.2.6 // indirect
218218
periph.io/x/host/v3 v3.8.2 // indirect
219219
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 // indirect
@@ -238,7 +238,7 @@ require (
238238
github.com/go-openapi/jsonpointer v0.21.0 // indirect
239239
github.com/go-openapi/jsonreference v0.21.0 // indirect
240240
github.com/go-openapi/swag v0.23.0 // indirect
241-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
241+
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
242242
github.com/google/btree v1.1.2 // indirect
243243
github.com/google/gnostic-models v0.6.8 // indirect
244244
github.com/google/gofuzz v1.2.0 // indirect
@@ -289,7 +289,7 @@ require (
289289
google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 // indirect
290290
gopkg.in/inf.v0 v0.9.1 // indirect
291291
gopkg.in/yaml.v2 v2.4.0 // indirect
292-
k8s.io/component-base v0.31.2 // indirect
292+
k8s.io/component-base v0.31.3 // indirect
293293
k8s.io/klog/v2 v2.130.1
294294
k8s.io/kube-openapi v0.0.0-20240521193020-835d969ad83a // indirect
295295
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect

0 commit comments

Comments
 (0)