Skip to content

Commit 0d65b01

Browse files
anuragagarwal561994anuragagarwal561994
committed
Merge remote-tracking branch 'upstream/main' into client-wrr
2 parents 8bce886 + aa3ad43 commit 0d65b01

File tree

637 files changed

+7449
-1691
lines changed

Some content is hidden

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

637 files changed

+7449
-1691
lines changed

‎.github/workflows/build_and_test.yaml‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
lint:
4141
runs-on: ubuntu-22.04
4242
steps:
43-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
43+
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
4444
- uses: ./tools/github-actions/setup-deps
4545
# Generate the installation manifests first, so it can check
4646
# for errors while running `make -k lint`
@@ -51,14 +51,14 @@ jobs:
5151
gen-check:
5252
runs-on: ubuntu-22.04
5353
steps:
54-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
54+
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
5555
- uses: ./tools/github-actions/setup-deps
5656
- run: make -k gen-check
5757

5858
license-check:
5959
runs-on: ubuntu-latest
6060
steps:
61-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
61+
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
6262
- uses: ./tools/github-actions/setup-deps
6363
- run: make -k licensecheck
6464

@@ -71,7 +71,7 @@ jobs:
7171
- changes
7272
if: ${{ github.event_name != 'pull_request' || needs.changes.outputs.run_test_workflow == 'true' }}
7373
steps:
74-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
74+
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
7575
- uses: ./tools/github-actions/setup-deps
7676

7777
# test
@@ -90,9 +90,10 @@ jobs:
9090
runs-on: ubuntu-latest
9191
needs:
9292
- changes
93+
- build
9394
if: ${{ github.event_name != 'pull_request' || needs.changes.outputs.run_test_workflow == 'true' }}
9495
steps:
95-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
96+
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
9697
with:
9798
fetch-depth: 0 # Need main branch access for benchmark comparison
9899
- uses: ./tools/github-actions/setup-deps
@@ -110,7 +111,7 @@ jobs:
110111
needs: [changes, lint, gen-check, license-check, coverage-test]
111112
if: ${{ github.event_name != 'pull_request' || needs.changes.outputs.run_test_workflow == 'true' }}
112113
steps:
113-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
114+
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
114115
- uses: ./tools/github-actions/setup-deps
115116

116117
- name: Build EG Multiarch Binaries
@@ -152,7 +153,7 @@ jobs:
152153
ipFamily: ipv4
153154
profile: xds-name-scheme-v2
154155
steps:
155-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
156+
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
156157
- uses: ./tools/github-actions/setup-deps
157158

158159
- name: Download EG Binaries
@@ -206,7 +207,7 @@ jobs:
206207
profile: xds-name-scheme-v2
207208

208209
steps:
209-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
210+
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
210211
- uses: ./tools/github-actions/setup-deps
211212
- uses: ./tools/github-actions/reclaim-storage
212213

@@ -247,7 +248,7 @@ jobs:
247248
# So we need to check if this is a pull request and changes.
248249
if: ${{ github.event_name == 'pull_request' && needs.changes.outputs.run_test_workflow == 'true' }}
249250
steps:
250-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
251+
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
251252
- uses: ./tools/github-actions/setup-deps
252253

253254

@@ -278,7 +279,7 @@ jobs:
278279
- build
279280
- changes
280281
steps:
281-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
282+
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
282283
- uses: ./tools/github-actions/setup-deps
283284
- name: Resilience Test
284285
env:
@@ -290,7 +291,7 @@ jobs:
290291
runs-on: ubuntu-latest
291292
needs: [conformance-test, e2e-test]
292293
steps:
293-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
294+
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
294295
- uses: ./tools/github-actions/setup-deps
295296

296297
- name: Download EG Binaries

‎.github/workflows/codeql.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,18 +32,18 @@ jobs:
3232

3333
steps:
3434
- name: Checkout repository
35-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
35+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
3636
- uses: ./tools/github-actions/setup-deps
3737

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

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

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

‎.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-22.04
2222
steps:
2323
- name: Check out code
24-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
24+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
2525
with:
2626
ref: ${{ github.event.pull_request.head.sha }}
2727

@@ -46,7 +46,7 @@ jobs:
4646
contents: write
4747
steps:
4848
- name: Git checkout
49-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
49+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
5050
with:
5151
submodules: true
5252
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
@@ -46,7 +46,7 @@ jobs:
4646
ipFamily: dual
4747
profile: gateway-namespace-mode
4848
steps:
49-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
49+
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
5050
- uses: ./tools/github-actions/setup-deps
5151

5252
# gateway api experimental conformance

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ jobs:
1616
runs-on: ubuntu-22.04
1717
steps:
1818
- name: Checkout code
19-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
19+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
2020
- name: Run scanner
21-
uses: google/osv-scanner-action/osv-scanner-action@9bb69575e74019c2ad085a1860787043adf47ccb # v2.2.4
21+
uses: google/osv-scanner-action/osv-scanner-action@b77c075a1235514558f0eb88dbd31e22c45e0cd2 # v2.3.0
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@9bb69575e74019c2ad085a1860787043adf47ccb" # v2.2.4
22+
uses: "google/osv-scanner-action/.github/workflows/osv-scanner-reusable.yml@b77c075a1235514558f0eb88dbd31e22c45e0cd2" # v2.3.0
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@9bb69575e74019c2ad085a1860787043adf47ccb" # v2.2.4
35+
uses: "google/osv-scanner-action/.github/workflows/osv-scanner-reusable-pr.yml@b77c075a1235514558f0eb88dbd31e22c45e0cd2" # v2.3.0
3636
with:
3737
scan-args: |-
3838
--recursive

‎.github/workflows/release.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
benchmark-test:
2020
runs-on: ubuntu-latest
2121
steps:
22-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
22+
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
2323
- uses: ./tools/github-actions/setup-deps
2424

2525

@@ -53,7 +53,7 @@ jobs:
5353
permissions:
5454
contents: write
5555
steps:
56-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
56+
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
5757
- uses: ./tools/github-actions/reclaim-storage
5858

5959
- name: Extract Release Tag and Commit SHA

‎.github/workflows/scorecard.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121

2222
steps:
2323
- name: "Checkout code"
24-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
24+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
2525
with:
2626
persist-credentials: false
2727

@@ -40,6 +40,6 @@ jobs:
4040
retention-days: 5
4141

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

‎.github/workflows/trivy.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
runs-on: ubuntu-22.04
1919
steps:
2020
- name: Checkout code
21-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
21+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
2222
# We need to fetch tags so go binary will be built with the recent vX.Y.Z-rc.0 tag,
2323
# which will help to avoid false positives in trivy scan.
2424
# `fetch-tags: true` doesn't work: https://github.com/actions/checkout/issues/1471

‎api/v1alpha1/envoyproxy_metric_types.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,15 +45,15 @@ type ProxyMetrics struct {
4545
// ClusterStatName defines the value of cluster alt_stat_name, determining how cluster stats are named.
4646
// For more details, see envoy docs: https://www.envoyproxy.io/docs/envoy/latest/api-v3/config/cluster/v3/cluster.proto.html
4747
// The supported operators for this pattern are:
48-
// %ROUTE_NAME%: name of Gateway API xRoute resource
49-
// %ROUTE_NAMESPACE%: namespace of Gateway API xRoute resource
50-
// %ROUTE_KIND%: kind of Gateway API xRoute resource
51-
// %ROUTE_RULE_NAME%: name of the Gateway API xRoute section
52-
// %ROUTE_RULE_NUMBER%: name of the Gateway API xRoute section
53-
// %BACKEND_REFS%: names of all backends referenced in <NAMESPACE>/<NAME>|<NAMESPACE>/<NAME>|... format
48+
// `%ROUTE_NAME%`: name of Gateway API xRoute resource
49+
// `%ROUTE_NAMESPACE%`: namespace of Gateway API xRoute resource
50+
// `%ROUTE_KIND%`: kind of Gateway API xRoute resource
51+
// `%ROUTE_RULE_NAME%`: name of the Gateway API xRoute section
52+
// `%ROUTE_RULE_NUMBER%`: name of the Gateway API xRoute section
53+
// `%BACKEND_REFS%`: names of all backends referenced in `<NAMESPACE>/<NAME>|<NAMESPACE>/<NAME>|...` format
5454
// Only xDS Clusters created for HTTPRoute and GRPCRoute are currently supported.
55-
// Default: %ROUTE_KIND%/%ROUTE_NAMESPACE%/%ROUTE_NAME%/rule/%ROUTE_RULE_NUMBER%
56-
// Example: httproute/my-ns/my-route/rule/0
55+
// Default: `%ROUTE_KIND%/%ROUTE_NAMESPACE%/%ROUTE_NAME%/rule/%ROUTE_RULE_NUMBER%`
56+
// Example: `httproute/my-ns/my-route/rule/0`
5757
//
5858
// +optional
5959
ClusterStatName *string `json:"clusterStatName,omitempty"`

0 commit comments

Comments
 (0)