Skip to content

Commit fe0585d

Browse files
authored
Merge branch 'main' into support-custom-CRDs-for-ExtensionServer-in-Standalone-Mode
2 parents 0ef8f43 + aa2f693 commit fe0585d

File tree

489 files changed

+25849
-3403
lines changed

Some content is hidden

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

489 files changed

+25849
-3403
lines changed

.github/workflows/build_and_test.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ jobs:
117117
run: make build-multiarch PLATFORMS="linux_amd64 linux_arm64"
118118

119119
- name: Upload EG Binaries
120-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
120+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
121121
with:
122122
name: envoy-gateway
123123
path: bin/
@@ -156,7 +156,7 @@ jobs:
156156
- uses: ./tools/github-actions/setup-deps
157157

158158
- name: Download EG Binaries
159-
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
159+
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
160160
with:
161161
name: envoy-gateway
162162
path: bin/
@@ -210,7 +210,7 @@ jobs:
210210
- uses: ./tools/github-actions/setup-deps
211211

212212
- name: Download EG Binaries
213-
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
213+
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
214214
with:
215215
name: envoy-gateway
216216
path: bin/
@@ -265,7 +265,7 @@ jobs:
265265
run: make benchmark
266266

267267
- name: Upload Benchmark report
268-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
268+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
269269
with:
270270
name: benchmark-report
271271
path: ./test/benchmark/benchmark_report/
@@ -293,7 +293,7 @@ jobs:
293293
- uses: ./tools/github-actions/setup-deps
294294

295295
- name: Download EG Binaries
296-
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
296+
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
297297
with:
298298
name: envoy-gateway
299299
path: bin/

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

4343
- name: Autobuild
44-
uses: github/codeql-action/autobuild@16140ae1a102900babc80a33c44059580f687047 # v3.29.5
44+
uses: github/codeql-action/autobuild@0499de31b99561a6d14a36a5f662c2a54f91beee # v3.29.5
4545

4646
- name: Perform CodeQL Analysis
47-
uses: github/codeql-action/analyze@16140ae1a102900babc80a33c44059580f687047 # v3.29.5
47+
uses: github/codeql-action/analyze@0499de31b99561a6d14a36a5f662c2a54f91beee # 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
@@ -34,7 +34,7 @@ jobs:
3434
config_file: ".github/markdown_lint_config.json"
3535

3636
- name: Install linkinator
37-
run: npm install -g linkinator@6.0.4
37+
run: npm install -g linkinator@7.4.0
3838

3939
- name: Check links
4040
run: make docs docs-check-links

.github/workflows/experimental_conformance.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
run: make experimental-conformance
6161

6262
- name: Upload Conformance Report
63-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
63+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
6464
with:
6565
name: conformance-report-k8s-${{ matrix.target.version }}-${{ matrix.target.profile }}
6666
path: ./test/conformance/conformance-report-k8s-${{ matrix.target.version }}-${{ matrix.target.profile }}.yaml

.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@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
2020
- name: Run scanner
21-
uses: google/osv-scanner-action/osv-scanner-action@e92b5d07338d4f0ba0981dffed17c48976ca4730 # v2.2.3
21+
uses: google/osv-scanner-action/osv-scanner-action@9bb69575e74019c2ad085a1860787043adf47ccb # v2.2.4
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@e92b5d07338d4f0ba0981dffed17c48976ca4730" # v2.2.3
22+
uses: "google/osv-scanner-action/.github/workflows/osv-scanner-reusable.yml@9bb69575e74019c2ad085a1860787043adf47ccb" # v2.2.4
2323
with:
2424
scan-args: |-
2525
--recursive
@@ -32,7 +32,7 @@ jobs:
3232

3333
scan-pr:
3434
if: ${{ github.event_name == 'pull_request' || github.event_name == 'merge_group' }}
35-
uses: "google/osv-scanner-action/.github/workflows/osv-scanner-reusable-pr.yml@e92b5d07338d4f0ba0981dffed17c48976ca4730" # v2.2.3
35+
uses: "google/osv-scanner-action/.github/workflows/osv-scanner-reusable-pr.yml@9bb69575e74019c2ad085a1860787043adf47ccb" # v2.2.4
3636
with:
3737
scan-args: |-
3838
--recursive

.github/workflows/release.yaml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ on:
88
# Sequence of patterns matched against refs/tags
99
tags:
1010
- "v*.*.*"
11+
# Exclude rc.0 tags — they’re not real release candidates but markers for main
12+
# See: https://github.com/envoyproxy/gateway/issues/7248
13+
- "!v*.*.*-rc.0"
14+
1115

1216
jobs:
1317
# For push event, we run benchmark test here because we need to
@@ -38,7 +42,7 @@ jobs:
3842
run: cd test/benchmark && zip -r benchmark_report.zip benchmark_report
3943

4044
- name: Upload Benchmark Report
41-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
45+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
4246
with:
4347
name: benchmark_report
4448
path: test/benchmark/benchmark_report.zip
@@ -77,7 +81,7 @@ jobs:
7781
IMAGE_PULL_POLICY=IfNotPresent OCI_REGISTRY=oci://docker.io/envoyproxy CHART_VERSION=${{ env.without_v_release_tag }} IMAGE=docker.io/envoyproxy/gateway TAG=${{ env.release_tag }} make helm-package helm-push
7882
7983
- name: Download Benchmark Report
80-
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
84+
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
8185
with:
8286
name: benchmark_report
8387
path: release-artifacts

.github/workflows/scorecard.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,13 @@ jobs:
3333
publish_results: true
3434

3535
- name: "Upload artifact"
36-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
36+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
3737
with:
3838
name: SARIF file
3939
path: results.sarif
4040
retention-days: 5
4141

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

.github/workflows/trivy.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,16 @@ jobs:
1919
steps:
2020
- name: Checkout code
2121
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
22+
# We need to fetch tags so go binary will be built with the recent vX.Y.Z-rc.0 tag,
23+
# which will help to avoid false positives in trivy scan.
24+
# `fetch-tags: true` doesn't work: https://github.com/actions/checkout/issues/1471
25+
# As a workaround `filter: tree:0` is used to create a treeless clone.
26+
# See:
27+
# https://github.com/actions/checkout/issues/1471#issuecomment-1755639487
28+
# https://github.blog/open-source/git/get-up-to-speed-with-partial-clone-and-shallow-clone/
29+
with:
30+
fetch-depth: 0
31+
filter: tree:0
2232

2333
- name: Build an image from Dockerfile
2434
run: |

.trivyignore

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)