Skip to content

Commit d59c24d

Browse files
committed
Merge remote-tracking branch 'upstream/main' into api-request-buffer-limit
# Conflicts: # release-notes/current.yaml
2 parents c0d266a + cdda179 commit d59c24d

133 files changed

Lines changed: 1380 additions & 308 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.

.agents/skills/pr-review/SKILL.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ metadata:
4646
- For bug fixes, check that `test/e2e` has coverage if the bug is in user-facing code or has user-facing impact.
4747

4848
### Release notes
49-
Release notes should be added to `release-notes/current.yaml` for any of the following changes:
50-
- Bug fixes should be noted as "bug fix" and include a brief description of the issue and the fix.
49+
Release notes should be added as a new fragment file under `release-notes/current/<section>/<pr-number>-<slug>.md` (see `release-notes/current/README.md`) for any of the following changes. One change per file; the section directory determines the category.
50+
- Bug fixes should be noted as "bug fix" (`bug_fixes/`) and include a brief description of the issue and the fix.
5151
- New features should be noted as "new feature" and include a brief description of the feature.
5252
- Any breaking changes should be noted as "breaking change" and include a clear description of the change and its impact on users.
5353
- Any change to generated Envoy config (xDS) that moves, removes, or modifies existing config content would break EnvoyPatchPolicies and Extension Servers, so it should be noted as a breaking change. Additions to generated xDS config do not need to be called out.

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ Fixes #
2828

2929
<!--
3030
For any non-trivial changes, you need to provide a brief description of the changes in the release notes.
31-
Please add the description to the release-notes/current.yaml file and include this file in the PR.
31+
Please add a new fragment file under release-notes/current/<section>/<pr-number>-<slug>.md and include it in the PR.
32+
See release-notes/current/README.md for the available sections and the naming convention.
3233
-->
3334
Release Notes: Yes/No

.github/dependabot.yml

Lines changed: 126 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ updates:
6868
- package-ecosystem: pip
6969
directories:
7070
- /tools/src/codespell
71-
- /tools/src/sphinx-build
7271
- /tools/src/yamllint
7372
schedule:
7473
interval: weekly
@@ -81,3 +80,129 @@ updates:
8180
helm:
8281
patterns:
8382
- "*"
83+
# release/v1.8 branch updates — remove when release/v1.8 reaches EOL
84+
- package-ecosystem: docker
85+
target-branch: "release/v1.8"
86+
directories:
87+
- /tools/docker/envoy-gateway/
88+
schedule:
89+
interval: weekly
90+
commit-message:
91+
prefix: "[release-1.8]"
92+
- package-ecosystem: github-actions
93+
target-branch: "release/v1.8"
94+
directories:
95+
- /
96+
- /tools/github-actions/setup-deps
97+
schedule:
98+
interval: weekly
99+
commit-message:
100+
prefix: "[release-1.8]"
101+
ignore:
102+
- dependency-name: "envoyproxy/toolshed/gh-actions/retest"
103+
groups:
104+
actions:
105+
patterns:
106+
- "*"
107+
- package-ecosystem: gomod
108+
target-branch: "release/v1.8"
109+
directories:
110+
- "/"
111+
schedule:
112+
interval: weekly
113+
commit-message:
114+
prefix: "[release-1.8]"
115+
ignore:
116+
- dependency-name: "github.com/google/cel-go"
117+
- dependency-name: "github.com/google/go-containerregistry"
118+
- dependency-name: "k8s.io/apimachinery"
119+
groups:
120+
gomod:
121+
patterns:
122+
- "github.com*"
123+
- "go.opentelemetry.io*"
124+
- "golang*"
125+
- "golang.org*"
126+
- "google*"
127+
- "google.golang.org*"
128+
- "fortio.org*"
129+
- "gopkg.in*"
130+
- "helm.sh*"
131+
- "gomodules.xyz*"
132+
exclude-patterns:
133+
- "github.com/envoyproxy/go-control-plane*"
134+
k8s.io:
135+
patterns:
136+
- "k8s.io/*"
137+
- package-ecosystem: pip
138+
target-branch: "release/v1.8"
139+
directories:
140+
- /tools/src/codespell
141+
- /tools/src/yamllint
142+
schedule:
143+
interval: weekly
144+
commit-message:
145+
prefix: "[release-1.8]"
146+
# release/v1.7 branch updates — remove when release/v1.7 reaches EOL
147+
- package-ecosystem: docker
148+
target-branch: "release/v1.7"
149+
directories:
150+
- /tools/docker/envoy-gateway/
151+
schedule:
152+
interval: weekly
153+
commit-message:
154+
prefix: "[release-1.7]"
155+
- package-ecosystem: github-actions
156+
target-branch: "release/v1.7"
157+
directories:
158+
- /
159+
- /tools/github-actions/setup-deps
160+
schedule:
161+
interval: weekly
162+
commit-message:
163+
prefix: "[release-1.7]"
164+
ignore:
165+
- dependency-name: "envoyproxy/toolshed/gh-actions/retest"
166+
groups:
167+
actions:
168+
patterns:
169+
- "*"
170+
- package-ecosystem: gomod
171+
target-branch: "release/v1.7"
172+
directories:
173+
- "/"
174+
schedule:
175+
interval: weekly
176+
commit-message:
177+
prefix: "[release-1.7]"
178+
ignore:
179+
- dependency-name: "github.com/google/cel-go"
180+
- dependency-name: "github.com/google/go-containerregistry"
181+
- dependency-name: "k8s.io/apimachinery"
182+
groups:
183+
gomod:
184+
patterns:
185+
- "github.com*"
186+
- "go.opentelemetry.io*"
187+
- "golang*"
188+
- "golang.org*"
189+
- "google*"
190+
- "google.golang.org*"
191+
- "fortio.org*"
192+
- "gopkg.in*"
193+
- "helm.sh*"
194+
- "gomodules.xyz*"
195+
exclude-patterns:
196+
- "github.com/envoyproxy/go-control-plane*"
197+
k8s.io:
198+
patterns:
199+
- "k8s.io/*"
200+
- package-ecosystem: pip
201+
target-branch: "release/v1.7"
202+
directories:
203+
- /tools/src/codespell
204+
- /tools/src/yamllint
205+
schedule:
206+
interval: weekly
207+
commit-message:
208+
prefix: "[release-1.7]"

.github/workflows/build_and_test.yaml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
lint:
4242
runs-on: ubuntu-latest
4343
steps:
44-
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
44+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
4545
- uses: ./tools/github-actions/setup-deps
4646
# Generate the installation manifests first, so it can check
4747
# for errors while running `make -k lint`
@@ -52,14 +52,14 @@ jobs:
5252
gen-check:
5353
runs-on: ubuntu-latest
5454
steps:
55-
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
55+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
5656
- uses: ./tools/github-actions/setup-deps
5757
- run: make -k gen-check
5858

5959
license-check:
6060
runs-on: ubuntu-latest
6161
steps:
62-
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
62+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
6363
- uses: ./tools/github-actions/setup-deps
6464
- run: make -k licensecheck
6565

@@ -72,7 +72,7 @@ jobs:
7272
- changes
7373
if: ${{ github.event_name != 'pull_request' || needs.changes.outputs.run_test_workflow == 'true' }}
7474
steps:
75-
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
75+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
7676
- uses: ./tools/github-actions/setup-deps
7777

7878
# test
@@ -95,7 +95,7 @@ jobs:
9595
- build
9696
if: ${{ github.event_name != 'pull_request' || needs.changes.outputs.run_test_workflow == 'true' }}
9797
steps:
98-
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
98+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
9999
with:
100100
fetch-depth: 0 # Need main branch access for benchmark comparison
101101
- uses: ./tools/github-actions/setup-deps
@@ -112,7 +112,7 @@ jobs:
112112
needs: [changes, lint, gen-check, license-check, coverage-test]
113113
if: ${{ github.event_name != 'pull_request' || needs.changes.outputs.run_test_workflow == 'true' }}
114114
steps:
115-
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
115+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
116116
# For main branch builds, we need to fetch tags so go binary will be built with
117117
# the recent vX.Y.Z-rc.0 tag, which helps avoid false positives in vulnerability scans.
118118
# `fetch-tags: true` doesn't work: https://github.com/actions/checkout/issues/1471
@@ -141,7 +141,7 @@ jobs:
141141
needs: [changes, lint, gen-check, license-check, coverage-test]
142142
if: ${{ github.event_name != 'pull_request' || needs.changes.outputs.run_test_workflow == 'true' }}
143143
steps:
144-
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
144+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
145145
- uses: ./tools/github-actions/setup-deps
146146

147147
- name: Build egctl Binary
@@ -187,7 +187,7 @@ jobs:
187187
profile: watch-namespaces
188188
gwapiChannel: experimental
189189
steps:
190-
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
190+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
191191
- uses: ./tools/github-actions/setup-deps
192192

193193
- name: Download EG Binaries
@@ -247,7 +247,7 @@ jobs:
247247
profile: watch-namespaces
248248

249249
steps:
250-
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
250+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
251251
- uses: ./tools/github-actions/setup-deps
252252
- uses: ./tools/github-actions/reclaim-storage
253253

@@ -290,7 +290,7 @@ jobs:
290290
# So we need to check if this is a pull request and changes.
291291
if: ${{ github.event_name == 'pull_request' && needs.changes.outputs.run_test_workflow == 'true' }}
292292
steps:
293-
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
293+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
294294
- uses: ./tools/github-actions/setup-deps
295295

296296
- name: Download EG Binaries
@@ -330,7 +330,7 @@ jobs:
330330
- build
331331
- changes
332332
steps:
333-
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
333+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
334334
- uses: ./tools/github-actions/setup-deps
335335

336336
- name: Download EG Binaries
@@ -354,7 +354,7 @@ jobs:
354354
needs: [conformance-test, e2e-test]
355355
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
356356
steps:
357-
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
357+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
358358
- uses: ./tools/github-actions/setup-deps
359359

360360
- name: Download EG Binaries

.github/workflows/codeql.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232

3333
steps:
3434
- name: Checkout repository
35-
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
35+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
3636
- uses: ./tools/github-actions/setup-deps
3737

3838
- name: Initialize CodeQL

.github/workflows/docs.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
runs-on: ubuntu-latest
2222
steps:
2323
- name: Check out code
24-
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
24+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
2525
with:
2626
ref: ${{ github.event.pull_request.head.sha }}
2727

@@ -40,7 +40,7 @@ jobs:
4040
contents: write
4141
steps:
4242
- name: Git checkout
43-
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
43+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
4444
with:
4545
submodules: true
4646
ref: ${{ github.event.pull_request.head.sha }}

.github/workflows/experimental_conformance.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
ipFamily: ipv4
5050
profile: watch-namespaces
5151
steps:
52-
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
52+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
5353
- uses: ./tools/github-actions/setup-deps
5454

5555
# gateway api experimental conformance

.github/workflows/license-scan.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
runs-on: ubuntu-latest
1717
steps:
1818
- name: Checkout code
19-
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
19+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
2020
- name: Run scanner
2121
uses: google/osv-scanner-action/osv-scanner-action@9a498708959aeaef5ef730655706c5a1df1edbc2 # v2.3.8
2222
with:

.github/workflows/monthly-release-issue.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
runs-on: ubuntu-latest
1515
steps:
1616
- name: Checkout repository
17-
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
17+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
1818

1919
- name: Collect supported versions from hugo.toml
2020
id: versions

.github/workflows/release.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
verify-build-and-test:
1515
runs-on: ubuntu-latest
1616
steps:
17-
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
17+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
1818
- name: Verify Build and Test Success
1919
env:
2020
GH_TOKEN: ${{ github.token }}
@@ -56,7 +56,7 @@ jobs:
5656
if: ${{ !contains(github.ref, '-rc.0') }}
5757
runs-on: ubuntu-latest
5858
steps:
59-
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
59+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
6060
- uses: ./tools/github-actions/setup-deps
6161

6262

@@ -93,7 +93,7 @@ jobs:
9393
permissions:
9494
contents: write
9595
steps:
96-
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
96+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
9797
- uses: ./tools/github-actions/reclaim-storage
9898

9999
- name: Extract Release Tag and Commit SHA
@@ -159,7 +159,7 @@ jobs:
159159
160160
- name: Upload Release Manifests
161161
if: ${{ !contains(github.ref, '-rc.0') }}
162-
uses: softprops/action-gh-release@b4309332981a82ec1c5618f44dd2e27cc8bfbfda # v3.0.0
162+
uses: softprops/action-gh-release@718ea10b132b3b2eba29c1007bb80653f286566b # v3.0.1
163163
with:
164164
files: |
165165
release-artifacts/install.yaml

0 commit comments

Comments
 (0)