Skip to content

Commit 7ecbe8f

Browse files
jukiejukie
authored
Merge branch 'main' into rebase-8361
2 parents f4908d7 + f1f9829 commit 7ecbe8f

164 files changed

Lines changed: 42779 additions & 211 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.

‎.github/workflows/codeql.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,14 @@ jobs:
3636
- uses: ./tools/github-actions/setup-deps
3737

3838
- name: Initialize CodeQL
39-
uses: github/codeql-action/init@e46ed2cbd01164d986452f91f178727624ae40d7 # v3.29.5
39+
uses: github/codeql-action/init@68bde559dea0fdcac2102bfdf6230c5f70eb485e # v3.29.5
4040
with:
4141
languages: ${{ matrix.language }}
4242

4343
- name: Autobuild
44-
uses: github/codeql-action/autobuild@e46ed2cbd01164d986452f91f178727624ae40d7 # v3.29.5
44+
uses: github/codeql-action/autobuild@68bde559dea0fdcac2102bfdf6230c5f70eb485e # v3.29.5
4545

4646
- name: Perform CodeQL Analysis
47-
uses: github/codeql-action/analyze@e46ed2cbd01164d986452f91f178727624ae40d7 # v3.29.5
47+
uses: github/codeql-action/analyze@68bde559dea0fdcac2102bfdf6230c5f70eb485e # v3.29.5
4848
with:
4949
category: "/language:${{matrix.language}}"

‎.github/workflows/license-scan.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- name: Checkout code
1919
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2020
- name: Run scanner
21-
uses: google/osv-scanner-action/osv-scanner-action@c51854704019a247608d928f370c98740469d4b5 # v2.3.5
21+
uses: google/osv-scanner-action/osv-scanner-action@9a498708959aeaef5ef730655706c5a1df1edbc2 # v2.3.8
2222
with:
2323
scan-args: |- # See allowed licenses at https://github.com/cncf/foundation/blob/main/policies-guidance/allowed-third-party-license-policy.md#approved-licenses-for-allowlist
2424
--licenses=Apache-2.0,0BSD,BSD-2-Clause,BSD-2-Clause-FreeBSD,BSD-3-Clause,MIT,MIT-0,ISC,OpenSSL,OpenSSL-standalone,PSF-2.0,Python-2.0,Python-2.0.1,PostgreSQL,SSLeay-standalone,UPL-1.0,X11,Zlib

‎.github/workflows/osv-scanner.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ permissions:
1919
jobs:
2020
scan-scheduled:
2121
if: ${{ github.event_name == 'push' || github.event_name == 'schedule' }}
22-
uses: "google/osv-scanner-action/.github/workflows/osv-scanner-reusable.yml@c51854704019a247608d928f370c98740469d4b5" # v2.3.5
22+
uses: "google/osv-scanner-action/.github/workflows/osv-scanner-reusable.yml@9a498708959aeaef5ef730655706c5a1df1edbc2" # v2.3.8
2323
with:
2424
scan-args: |-
2525
--config tools/osv-scanner/vulnerability-scan-config.toml
@@ -33,7 +33,7 @@ jobs:
3333

3434
scan-pr:
3535
if: ${{ github.event_name == 'pull_request' || github.event_name == 'merge_group' }}
36-
uses: "google/osv-scanner-action/.github/workflows/osv-scanner-reusable-pr.yml@c51854704019a247608d928f370c98740469d4b5" # v2.3.5
36+
uses: "google/osv-scanner-action/.github/workflows/osv-scanner-reusable-pr.yml@9a498708959aeaef5ef730655706c5a1df1edbc2" # v2.3.8
3737
with:
3838
scan-args: |-
3939
--config tools/osv-scanner/vulnerability-scan-config.toml

‎.github/workflows/scorecard.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,6 @@ jobs:
4040
retention-days: 5
4141

4242
- name: "Upload to code-scanning"
43-
uses: github/codeql-action/upload-sarif@e46ed2cbd01164d986452f91f178727624ae40d7 # v3.29.5
43+
uses: github/codeql-action/upload-sarif@68bde559dea0fdcac2102bfdf6230c5f70eb485e # v3.29.5
4444
with:
4545
sarif_file: results.sarif

‎VERSION‎

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

‎examples/extension-server/go.mod‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ require (
99
github.com/urfave/cli/v2 v2.27.7
1010
google.golang.org/grpc v1.81.0
1111
google.golang.org/protobuf v1.36.12-0.20260120151049-f2248ac996af
12-
k8s.io/apimachinery v0.36.0
12+
k8s.io/apimachinery v0.36.1
1313
sigs.k8s.io/controller-runtime v0.24.0
1414
sigs.k8s.io/gateway-api v1.5.1
1515
sigs.k8s.io/gateway-api-inference-extension v1.5.0
@@ -65,9 +65,9 @@ require (
6565
gopkg.in/inf.v0 v0.9.1 // indirect
6666
gopkg.in/yaml.v2 v2.4.0 // indirect
6767
gopkg.in/yaml.v3 v3.0.1 // indirect
68-
k8s.io/api v0.36.0 // indirect
69-
k8s.io/apiextensions-apiserver v0.36.0 // indirect
70-
k8s.io/code-generator v0.36.0 // indirect
68+
k8s.io/api v0.36.1 // indirect
69+
k8s.io/apiextensions-apiserver v0.36.1 // indirect
70+
k8s.io/code-generator v0.36.1 // indirect
7171
k8s.io/gengo/v2 v2.0.0-20250922181213-ec3ebc5fd46b // indirect
7272
k8s.io/klog/v2 v2.140.0 // indirect
7373
k8s.io/kube-openapi v0.0.0-20260317180543-43fb72c5454a // indirect

‎examples/extension-server/go.sum‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -230,20 +230,20 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
230230
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
231231
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
232232
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
233-
k8s.io/api v0.36.0 h1:SgqDhZzHdOtMk40xVSvCXkP9ME0H05hPM3p9AB1kL80=
234-
k8s.io/api v0.36.0/go.mod h1:m1LVrGPNYax5NBHdO+QuAedXyuzTt4RryI/qnmNvs34=
235-
k8s.io/apiextensions-apiserver v0.36.0 h1:Wt7E8J+VBCbj4FjiBfDTK/neXDDjyJVJc7xfuOHImZ0=
236-
k8s.io/apiextensions-apiserver v0.36.0/go.mod h1:kGDjH0msuiIB3tgsYRV0kS9GqpMYMUsQ3GHv7TApyug=
237-
k8s.io/apimachinery v0.36.0 h1:jZyPzhd5Z+3h9vJLt0z9XdzW9VzNzWAUw+P1xZ9PXtQ=
238-
k8s.io/apimachinery v0.36.0/go.mod h1:FklypaRJt6n5wUIwWXIP6GJlIpUizTgfo1T/As+Tyxc=
239-
k8s.io/apiserver v0.36.0 h1:Jg5OFAENUACByUCg15CmhZAYrr5ZyJ+jodyA1mHl3YE=
240-
k8s.io/apiserver v0.36.0/go.mod h1:mHvwdHf+qKEm+1/hYm756SV+oREOKSPnsjagOpx6Vho=
241-
k8s.io/client-go v0.36.0 h1:pOYi7C4RHChYjMiHpZSpSbIM6ZxVbRXBy7CuiIwqA3c=
242-
k8s.io/client-go v0.36.0/go.mod h1:ZKKcpwF0aLYfkHFCjillCKaTK/yBkEDHTDXCFY6AS9Y=
243-
k8s.io/code-generator v0.36.0 h1:XWAkrhnArm0VWMmSFO7kyB+wE2LROwep7hEH0GPGkqA=
244-
k8s.io/code-generator v0.36.0/go.mod h1:Tr2UhfBRdlyRoadfob9aPCmmGe8PUs5XPK9MEJ2nx+w=
245-
k8s.io/component-base v0.36.0 h1:hFjEktssxiJhrK1zfybkH4kJOi8iZuF+mIDCqS5+jRo=
246-
k8s.io/component-base v0.36.0/go.mod h1:JZvIfcNHk+uck+8LhJzhSBtydWXaZNQwX2OdL+Mnwsk=
233+
k8s.io/api v0.36.1 h1:XbL/EMj8K2aJpJtePmqUyQMsM0D4QI2pvl7YKJ20FTY=
234+
k8s.io/api v0.36.1/go.mod h1:KOWo4ey3TINlXjeHVuwB3i+tXXnu+UcwFBHlI/9dvEo=
235+
k8s.io/apiextensions-apiserver v0.36.1 h1:6JfYmPUsuUIHuN+3QxutXYWj492RqF5fBSx67GYK5Ks=
236+
k8s.io/apiextensions-apiserver v0.36.1/go.mod h1:pLzZin90riwisdzKwv/GoTwENooytoIx5zWJb4Hkby8=
237+
k8s.io/apimachinery v0.36.1 h1:G63Gjx2W+q0YD+72Vo8oY0nDnePVwnuzTmmy5ENrVSA=
238+
k8s.io/apimachinery v0.36.1/go.mod h1:ibYOR00vW/I1kzvi5SF0dRuJ52BvKtfvRdOn35GPQ+8=
239+
k8s.io/apiserver v0.36.1 h1:iMS5V+rPUertv5P9RaqJgmHHTuh4quWpoxchvMUY+JY=
240+
k8s.io/apiserver v0.36.1/go.mod h1:Cby1PbLWztu0GDOxoO6iFOyyqIsziHNEW+w9zVQ22Kw=
241+
k8s.io/client-go v0.36.1 h1:FN/K8QIT2CEDt+2WB2HnWrUANZ50AP5GII43/SP2JR0=
242+
k8s.io/client-go v0.36.1/go.mod h1:s6rAnCtTGYDQnpNjEhSaISV+2O8jwruZ6m3QOYBFbtU=
243+
k8s.io/code-generator v0.36.1 h1:5bHQ7NbBcFFLHcoyo/hgU3m2tQV5RLz2nv4QNDlsbXc=
244+
k8s.io/code-generator v0.36.1/go.mod h1:oCv8WmrW2RGdcMyvSk1aYbBfSs51ggtSFQr1YNeuAuo=
245+
k8s.io/component-base v0.36.1 h1:iG6GsELftXqTNG9HG6kiVjatSgAw1sf5pJ6R5a6N0kA=
246+
k8s.io/component-base v0.36.1/go.mod h1:nf9XPlntRdqO6WMeEWAA5F93Y4ICZQdeT9GeqLDB3JI=
247247
k8s.io/gengo/v2 v2.0.0-20250922181213-ec3ebc5fd46b h1:gMplByicHV/TJBizHd9aVEsTYoJBnnUAT5MHlTkbjhQ=
248248
k8s.io/gengo/v2 v2.0.0-20250922181213-ec3ebc5fd46b/go.mod h1:CgujABENc3KuTrcsdpGmrrASjtQsWCT7R99mEV4U/fM=
249249
k8s.io/klog/v2 v2.140.0 h1:Tf+J3AH7xnUzZyVVXhTgGhEKnFqye14aadWv7bzXdzc=

‎examples/simple-extension-server/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module github.com/envoyproxy/gateway-simple-extension-server
33
go 1.26.3
44

55
require (
6-
github.com/envoyproxy/gateway v1.7.2
6+
github.com/envoyproxy/gateway v1.7.3
77
github.com/envoyproxy/go-control-plane/envoy v1.37.1-0.20260304210048-a81710db7097
88
github.com/urfave/cli/v2 v2.27.7
99
google.golang.org/grpc v1.81.0

‎examples/simple-extension-server/go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ github.com/cncf/xds/go v0.0.0-20260202195803-dba9d589def2 h1:aBangftG7EVZoUb69Os
66
github.com/cncf/xds/go v0.0.0-20260202195803-dba9d589def2/go.mod h1:qwXFYgsP6T7XnJtbKlf1HP8AjxZZyzxMmc+Lq5GjlU4=
77
github.com/cpuguy83/go-md2man/v2 v2.0.7 h1:zbFlGlXEAKlwXpmvle3d8Oe3YnkKIK4xSRTd3sHPnBo=
88
github.com/cpuguy83/go-md2man/v2 v2.0.7/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
9-
github.com/envoyproxy/gateway v1.7.2 h1:mIC52fBLZKO8ahwwh5hNbpWP++HLC7I7RO+6n6JcJbI=
10-
github.com/envoyproxy/gateway v1.7.2/go.mod h1:EiXhtwv0xkFE17KDXmchFF60jg0y9H9Ou3V7pIIzyUc=
9+
github.com/envoyproxy/gateway v1.7.3 h1:9tFKbq0G8IJUELxg2Ra4ECSOZf7mu+CjuA977gV1h4Y=
10+
github.com/envoyproxy/gateway v1.7.3/go.mod h1:Qv8zMS8mhQ2luIY1EBjOc0K2tj/WbRv3hT6mawgjq5I=
1111
github.com/envoyproxy/go-control-plane/envoy v1.37.1-0.20260304210048-a81710db7097 h1:Ou9X6qsPOiDOsQgaboj3jlCE5ZYngdYeSVDKBcT95QE=
1212
github.com/envoyproxy/go-control-plane/envoy v1.37.1-0.20260304210048-a81710db7097/go.mod h1:237/ZQHepDd4v5BjpRNFI2mMG7WEBd+mQnt8jwbqrnk=
1313
github.com/envoyproxy/protoc-gen-validate v1.3.3 h1:MVQghNeW+LZcmXe7SY1V36Z+WFMDjpqGAGacLe2T0ds=

‎go.mod‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ require (
3838
github.com/spf13/pflag v1.0.10
3939
github.com/stretchr/testify v1.11.1
4040
github.com/telepresenceio/watchable v0.0.0-20220726211108-9bb86f92afa7
41-
github.com/tetratelabs/func-e v1.4.0
41+
github.com/tetratelabs/func-e v1.5.0
4242
github.com/tsaarni/certyaml v0.11.0
4343
github.com/yuin/gopher-lua v1.1.2
4444
go.opentelemetry.io/otel v1.43.0
@@ -63,15 +63,15 @@ require (
6363
google.golang.org/protobuf v1.36.12-0.20260120151049-f2248ac996af
6464
gopkg.in/yaml.v3 v3.0.1
6565
helm.sh/helm/v3 v3.20.2
66-
k8s.io/api v0.36.0
67-
k8s.io/apiextensions-apiserver v0.36.0
68-
k8s.io/apimachinery v0.36.0
69-
k8s.io/apiserver v0.36.0
70-
k8s.io/cli-runtime v0.36.0
71-
k8s.io/client-go v0.36.0
66+
k8s.io/api v0.36.1
67+
k8s.io/apiextensions-apiserver v0.36.1
68+
k8s.io/apimachinery v0.36.1
69+
k8s.io/apiserver v0.36.1
70+
k8s.io/cli-runtime v0.36.1
71+
k8s.io/client-go v0.36.1
7272
k8s.io/klog/v2 v2.140.0
7373
k8s.io/kube-openapi v0.0.0-20260317180543-43fb72c5454a
74-
k8s.io/kubectl v0.36.0
74+
k8s.io/kubectl v0.36.1
7575
k8s.io/utils v0.0.0-20260210185600-b8788abfbbc2
7676
sigs.k8s.io/controller-runtime v0.24.0
7777
sigs.k8s.io/gateway-api v1.5.1
@@ -241,7 +241,8 @@ require (
241241
github.com/tklauser/go-sysconf v0.3.16 // indirect
242242
github.com/tklauser/numcpus v0.11.0 // indirect
243243
github.com/tsaarni/x500dn v1.1.0 // indirect
244-
github.com/ulikunitz/xz v0.5.15 // indirect
244+
github.com/ulikunitz/lz v0.6.11 // indirect
245+
github.com/ulikunitz/xz/v2 v2.0.0-dev.4 // indirect
245246
github.com/vbatts/tar-split v0.12.2 // indirect
246247
github.com/vishvananda/netlink v1.3.1 // indirect
247248
github.com/vishvananda/netns v0.0.5 // indirect
@@ -275,9 +276,9 @@ require (
275276
gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
276277
gopkg.in/inf.v0 v0.9.1 // indirect
277278
gopkg.in/yaml.v2 v2.4.0 // indirect
278-
k8s.io/component-base v0.36.0 // indirect
279-
k8s.io/metrics v0.36.0 // indirect
280-
k8s.io/streaming v0.36.0 // indirect
279+
k8s.io/component-base v0.36.1 // indirect
280+
k8s.io/metrics v0.36.1 // indirect
281+
k8s.io/streaming v0.36.1 // indirect
281282
oras.land/oras-go/v2 v2.6.0 // indirect
282283
periph.io/x/host/v3 v3.8.5 // indirect
283284
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.34.0 // indirect

0 commit comments

Comments
 (0)