Skip to content

Commit 33c5fcf

Browse files
committed
Merge remote-tracking branch 'upstream/main' into api-request-buffer-limit
# Conflicts: # internal/gatewayapi/backendtrafficpolicy.go
2 parents d59c24d + 2874485 commit 33c5fcf

691 files changed

Lines changed: 51381 additions & 9149 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/PULL_REQUEST_TEMPLATE.md

Lines changed: 29 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,27 @@
1-
**What type of PR is this?**
21
<!--
3-
Your PR title should be descriptive, and generally start with type that contains a subsystem name with `()` if necessary
4-
and summary followed by a colon. format `chore/docs/api/feat/fix/refactor/style/test: summary`.
2+
Your PR title should be descriptive, and generally start with a type that contains a subsystem name with `()` if necessary
3+
and a summary followed by a colon. format `chore/docs/api/feat/fix/refactor/style/test: summary`.
54
Examples:
65
* "docs: fix grammar error"
76
* "feat(translator): add new feature"
87
* "fix: fix xx bug"
98
* "chore: change ci & build tools etc"
109
* "api: add xxx fields in ClientTrafficPolicy"
11-
12-
Before raising a PR, please go through this section of the developer guide, https://gateway.envoyproxy.io/community/develop/#raising-a-pr
1310
-->
1411

1512
<!--
16-
NOTE: If your PR contains any API changes (changes under `/api`), we recommend you to separate these API changes into
17-
a new PR, and we will review the API part first. It will save you lots of implementation time if the API get accepted.
13+
NOTE: If your PR contains any API changes (changes under `/api`), the API must be discussed and
14+
agreed before the implementation. We strongly recommend separating API changes into their own PR so
15+
we can review the API first, but the API may also live in the same PR as long as it was agreed
16+
beforehand. This will save you a lot of implementation time if the API gets accepted.
1817
-->
1918

2019
**What this PR does / why we need it**:
20+
<!--
21+
Briefly describe what this PR changes and the motivation behind it. Include enough context for a
22+
reviewer to understand the problem being solved and the approach taken, e.g. what behavior changes,
23+
any alternatives considered, and anything reviewers should pay special attention to.
24+
-->
2125

2226
**Which issue(s) this PR fixes**:
2327
<!--
@@ -26,9 +30,23 @@ Usage: `Fixes #<issue number>`, or `Fixes (paste link of issue)`.
2630
-->
2731
Fixes #
2832

33+
---
34+
35+
**PR Checklist**
2936
<!--
30-
For any non-trivial changes, you need to provide a brief description of the changes in the release notes.
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.
37+
Please tick the boxes below before requesting a review. PRs that leave required items unchecked may
38+
be delayed or closed. Replace `[ ]` with `[x]` to check a box. If an item does not apply, check it
39+
and add "N/A: <reason>".
3340
-->
34-
Release Notes: Yes/No
41+
42+
- [ ] **Authorship & ownership**: Coding agents / AI assistants are welcome, but I have reviewed every change, understand how and why it works, can explain and maintain it, and take full responsibility for this PR. I have not submitted generated output I do not understand.
43+
- [ ] **DCO**: All commits are signed off (`git commit -s`). See [DCO: Sign your work](https://gateway.envoyproxy.io/community/contributing/#dco-sign-your-work).
44+
- [ ] **API agreed first**: If this PR contains API changes (changes under `/api`), the API was discussed and agreed **before** the implementation. The API change can be in a separate PR, or in the same PR, but the API must be agreed before implementation. N/A if this PR does not contain API changes.
45+
- [ ] **Required checks pass**: `make generate gen-check`, `make lint`, and the unit-test/coverage build pass. (Flaky e2e failures are not considered breakages, but `gen-check`, `lint`, and coverage **MUST** pass.)
46+
- [ ] **Tests added/updated**: New/changed code is covered by appropriate tests. N/A if this PR does not contain code changes.
47+
- [ ] **Docs**: User-facing changes update the [docs](https://github.com/envoyproxy/gateway/tree/main/site), either in this PR or a follow-up PR. N/A if this PR does not contain user-facing changes.
48+
- [ ] **Release notes**: For any non-trivial change, added a release-note fragment under `release-notes/current/<section>/<pr-number>-<slug>.md` (see `release-notes/current/README.md` for sections and naming). N/A if this PR does not contain non-trivial changes.
49+
- [ ] **Generated files committed**: Ran `make gen-check` and committed the result if API/helm charts/modules changed.
50+
- [ ] **Scope & compatibility**: The PR is reasonably scoped (no unrelated changes) and preserves backward compatibility, or any breaking change is called out above and documented in `release-notes/current/breaking_changes/`.
51+
- [ ] **Codex review**: Requested a Codex review and addressed all of its comments.
52+
- [ ] **Copilot review**: Requested a Copilot review and addressed all of its comments.

.github/dependabot.yml

Lines changed: 10 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,11 @@ updates:
115115
ignore:
116116
- dependency-name: "github.com/google/cel-go"
117117
- dependency-name: "github.com/google/go-containerregistry"
118-
- dependency-name: "k8s.io/apimachinery"
118+
- dependency-name: "github.com/envoyproxy/go-control-plane*"
119+
# Ignore all k8s.io packages on release branches to avoid unintended k8s version bumps
120+
- dependency-name: "k8s.io/*"
121+
# Ignore sigs.k8s.io/gateway-api on release branches to avoid unintended Gateway API version bumps
122+
- dependency-name: "sigs.k8s.io/gateway-api"
119123
groups:
120124
gomod:
121125
patterns:
@@ -129,20 +133,6 @@ updates:
129133
- "gopkg.in*"
130134
- "helm.sh*"
131135
- "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]"
146136
# release/v1.7 branch updates — remove when release/v1.7 reaches EOL
147137
- package-ecosystem: docker
148138
target-branch: "release/v1.7"
@@ -178,7 +168,11 @@ updates:
178168
ignore:
179169
- dependency-name: "github.com/google/cel-go"
180170
- dependency-name: "github.com/google/go-containerregistry"
181-
- dependency-name: "k8s.io/apimachinery"
171+
- dependency-name: "github.com/envoyproxy/go-control-plane*"
172+
# Ignore all k8s.io packages on release branches to avoid unintended k8s version bumps
173+
- dependency-name: "k8s.io/*"
174+
# Ignore sigs.k8s.io/gateway-api on release branches to avoid unintended Gateway API version bumps
175+
- dependency-name: "sigs.k8s.io/gateway-api"
182176
groups:
183177
gomod:
184178
patterns:
@@ -192,17 +186,3 @@ updates:
192186
- "gopkg.in*"
193187
- "helm.sh*"
194188
- "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: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
outputs:
2828
run_test_workflow: ${{ steps.check-changes.outputs.run_test_workflow }}
2929
steps:
30-
- uses: dorny/paths-filter@fbd0ab8f3e69293af611ebaee6363fc25e6d187d # v4.0.1
30+
- uses: dorny/paths-filter@7b450fff21473bca461d4b92ce414b9d0420d706 # v4.0.2
3131
id: check-changes
3232
# A dependent job will be automatically skipped if its parent job is skipped.
3333
# So we skip this step in pull_request event if the changes are not relevant.
@@ -157,32 +157,32 @@ jobs:
157157
fail-fast: false
158158
matrix:
159159
target:
160-
- version: v1.32.11
160+
- version: v1.33.12
161161
ipFamily: ipv4
162162
profile: default
163163
gwapiChannel: standard
164-
- version: v1.33.7
164+
- version: v1.34.8
165165
ipFamily: ipv4
166166
profile: default
167167
gwapiChannel: experimental
168-
- version: v1.34.3
168+
- version: v1.35.5
169169
ipFamily: ipv6 # only run ipv6 test on this version to save time
170170
profile: default
171171
gwapiChannel: experimental
172172
# TODO: this's IPv4 first, need a way to test IPv6 first.
173-
- version: v1.35.0
173+
- version: v1.36.1
174174
ipFamily: dual # only run dual test on latest version to save time
175175
profile: default
176176
gwapiChannel: experimental
177-
- version: v1.35.0
177+
- version: v1.36.1
178178
ipFamily: dual # only run dual test on latest version to save time
179179
gwapiChannel: experimental
180180
profile: gateway-namespace-mode
181-
- version: v1.35.0
181+
- version: v1.36.1
182182
ipFamily: ipv4
183183
profile: xds-name-scheme-v2
184184
gwapiChannel: experimental
185-
- version: v1.35.0
185+
- version: v1.36.1
186186
ipFamily: ipv4
187187
profile: watch-namespaces
188188
gwapiChannel: experimental
@@ -223,26 +223,26 @@ jobs:
223223
fail-fast: false
224224
matrix:
225225
target:
226-
- version: v1.32.11
226+
- version: v1.33.12
227227
ipFamily: ipv4
228228
profile: default
229-
- version: v1.33.7
229+
- version: v1.34.8
230230
ipFamily: ipv4
231231
profile: default
232-
- version: v1.34.3
232+
- version: v1.35.5
233233
ipFamily: ipv6 # only run ipv6 test on this version to save time
234234
profile: default
235235
# TODO: this's IPv4 first, need a way to test IPv6 first.
236-
- version: v1.35.0
236+
- version: v1.36.1
237237
ipFamily: dual # only run dual test on latest version to save time
238238
profile: default
239-
- version: v1.35.0
239+
- version: v1.36.1
240240
ipFamily: dual # only run dual test on latest version to save time
241241
profile: gateway-namespace-mode
242-
- version: v1.35.0
242+
- version: v1.36.1
243243
ipFamily: ipv4
244244
profile: xds-name-scheme-v2
245-
- version: v1.35.0
245+
- version: v1.36.1
246246
ipFamily: ipv4
247247
profile: watch-namespaces
248248

@@ -368,7 +368,7 @@ jobs:
368368

369369
# build and push image
370370
- name: Login to DockerHub
371-
uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4.2.0
371+
uses: docker/login-action@af1e73f918a031802d376d3c8bbc3fe56130a9b0 # v4.4.0
372372
with:
373373
username: ${{ vars.DOCKERHUB_USERNAME }}
374374
password: ${{ secrets.DOCKERHUB_PASSWORD }}

.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@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v3.29.5
39+
uses: github/codeql-action/init@99df26d4f13ea111d4ec1a7dddef6063f76b97e9 # v3.29.5
4040
with:
4141
languages: ${{ matrix.language }}
4242

4343
- name: Autobuild
44-
uses: github/codeql-action/autobuild@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v3.29.5
44+
uses: github/codeql-action/autobuild@99df26d4f13ea111d4ec1a7dddef6063f76b97e9 # v3.29.5
4545

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

.github/workflows/docs.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
- uses: ./tools/github-actions/setup-deps
4949

5050
- name: Setup Node
51-
uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
51+
uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
5252
with:
5353
node-version-file: site/.nvmrc
5454

.github/workflows/experimental_conformance.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,26 +26,26 @@ jobs:
2626
fail-fast: false
2727
matrix:
2828
target:
29-
- version: v1.32.11
29+
- version: v1.33.12
3030
ipFamily: ipv4
3131
profile: default
32-
- version: v1.33.7
32+
- version: v1.34.8
3333
ipFamily: ipv4
3434
profile: default
35-
- version: v1.34.3
35+
- version: v1.35.5
3636
# only run ipv6 test on this version to save time
3737
ipFamily: ipv6
3838
profile: default
3939
# TODO: this's IPv4 first, need a way to test IPv6 first.
40-
- version: v1.35.0
40+
- version: v1.36.1
4141
# only run dual test on latest version to save time
4242
ipFamily: dual
4343
profile: default
44-
- version: v1.35.0
44+
- version: v1.36.1
4545
# only run dual test on latest version to save time
4646
ipFamily: dual
4747
profile: gateway-namespace-mode
48-
- version: v1.35.0
48+
- version: v1.36.1
4949
ipFamily: ipv4
5050
profile: watch-namespaces
5151
steps:

.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@fa4ff678dd5d0a4fa3d628e57af8162873e93cd6" # main, pending release > v2.3.8 (incl. osv-scanner-action#130)
22+
uses: "google/osv-scanner-action/.github/workflows/osv-scanner-reusable.yml@a82132c0bd6c7261ffcb78e754c46c70ab57ad9a" # main, pending release > v2.3.8 (incl. osv-scanner-action#130)
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@fa4ff678dd5d0a4fa3d628e57af8162873e93cd6" # main, pending release > v2.3.8 (incl. osv-scanner-action#130)
36+
uses: "google/osv-scanner-action/.github/workflows/osv-scanner-reusable-pr.yml@a82132c0bd6c7261ffcb78e754c46c70ab57ad9a" # main, pending release > v2.3.8 (incl. osv-scanner-action#130)
3737
with:
3838
scan-args: |-
3939
--config tools/osv-scanner/vulnerability-scan-config.toml

.github/workflows/release.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ jobs:
107107
} >> "$GITHUB_ENV"
108108
109109
- name: Login to DockerHub
110-
uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4.2.0
110+
uses: docker/login-action@af1e73f918a031802d376d3c8bbc3fe56130a9b0 # v4.4.0
111111
with:
112112
username: ${{ vars.DOCKERHUB_USERNAME }}
113113
password: ${{ secrets.DOCKERHUB_PASSWORD }}
@@ -159,7 +159,7 @@ jobs:
159159
160160
- name: Upload Release Manifests
161161
if: ${{ !contains(github.ref, '-rc.0') }}
162-
uses: softprops/action-gh-release@718ea10b132b3b2eba29c1007bb80653f286566b # v3.0.1
162+
uses: softprops/action-gh-release@3d0d9888cb7fd7b750713d6e236d1fcb99157228 # v3.0.2
163163
with:
164164
files: |
165165
release-artifacts/install.yaml

.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@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v3.29.5
43+
uses: github/codeql-action/upload-sarif@99df26d4f13ea111d4ec1a7dddef6063f76b97e9 # v3.29.5
4444
with:
4545
sarif_file: results.sarif

.github/workflows/stale.yml

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

1919
steps:
2020
- name: Prune Stale
21-
uses: actions/stale@eb5cf3af3ac0a1aa4c9c45633dd1ae542a27a899 # v10.3.0
21+
uses: actions/stale@1e223db275d687790206a7acac4d1a11bd6fe629 # v10.4.0
2222
with:
2323
repo-token: ${{ secrets.GITHUB_TOKEN }}
2424
days-before-pr-stale: 30

0 commit comments

Comments
 (0)