Skip to content

Commit 35e87e5

Browse files
authored
Merge branch 'main' into ldamata/fix-least-request-LB-not-fair
Signed-off-by: Leonardo da Mata <barroca@gmail.com>
2 parents 1f9b298 + 2569b8c commit 35e87e5

140 files changed

Lines changed: 1369 additions & 1312 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.

.bazelrc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ build:compile-time-options --@envoy//source/extensions/filters/http/kill_request
355355

356356
# Docker sandbox
357357
# NOTE: Update this from https://github.com/envoyproxy/envoy-build-tools/blob/main/toolchains/rbe_toolchains_config.bzl#L8
358-
build:docker-sandbox --experimental_docker_image=envoyproxy/envoy-build-ubuntu:fdd65c6270a8507a18d5acd6cf19a18cb695e4fa@sha256:3c8a3ce6f90dcfb5d09dc8f79bb01404d3526d420061f9a176e0a8e91e1e573e
358+
build:docker-sandbox --experimental_docker_image=envoyproxy/envoy-build-ubuntu:7467652575122d8d54e767a68f141598bd855383@sha256:8781bc7e431b754c142edbfc937905fdf343db91f3fe19bbf54c362828db9849
359359
build:docker-sandbox --spawn_strategy=docker
360360
build:docker-sandbox --strategy=Javac=docker
361361
build:docker-sandbox --strategy=Closure=docker
@@ -515,7 +515,7 @@ build:rbe-envoy-engflow --grpc_keepalive_time=30s
515515
build:rbe-envoy-engflow --remote_timeout=3600s
516516
build:rbe-envoy-engflow --bes_timeout=3600s
517517
build:rbe-envoy-engflow --bes_upload_mode=fully_async
518-
build:rbe-envoy-engflow --remote_default_exec_properties=container-image=docker://docker.io/envoyproxy/envoy-build-ubuntu:fdd65c6270a8507a18d5acd6cf19a18cb695e4fa@sha256:3c8a3ce6f90dcfb5d09dc8f79bb01404d3526d420061f9a176e0a8e91e1e573e
518+
build:rbe-envoy-engflow --remote_default_exec_properties=container-image=docker://docker.io/envoyproxy/envoy-build-ubuntu:7467652575122d8d54e767a68f141598bd855383@sha256:8781bc7e431b754c142edbfc937905fdf343db91f3fe19bbf54c362828db9849
519519

520520
#############################################################################
521521
# debug: Various Bazel debugging flags

.devcontainer/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM gcr.io/envoy-ci/envoy-build:fdd65c6270a8507a18d5acd6cf19a18cb695e4fa@sha256:2a473cd9808182735d54e03b158975389948b9559b8e8fc624cfafbaf7059e62
1+
FROM gcr.io/envoy-ci/envoy-build:7467652575122d8d54e767a68f141598bd855383@sha256:af98298b715958527d3c3b42ae968a09223d237c843e129c586b7e76b8c69a0d
22

33
ARG USERNAME=vscode
44
ARG USER_UID=501

.github/dependabot.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ updates:
3535

3636
- package-ecosystem: "pip"
3737
directory: "/tools/base"
38+
open-pull-requests-limit: 20
3839
schedule:
3940
interval: "daily"
4041
time: "06:00"

.github/workflows/_cache_docker.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
docker:
3838
runs-on: ubuntu-22.04
3939
steps:
40-
- uses: envoyproxy/toolshed/gh-actions/docker/cache/prime@actions-v0.0.18
40+
- uses: envoyproxy/toolshed/gh-actions/docker/cache/prime@actions-v0.0.27
4141
name: Prime Docker cache (${{ inputs.image_repo }}:${{ inputs.image_tag }}@sha256:${{ inputs.image_sha }})
4242
with:
4343
image_tag: "${{ inputs.image_repo }}:${{ inputs.image_tag }}@sha256:${{ inputs.image_sha }}"

.github/workflows/_ci.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ jobs:
9595
steps:
9696
- if: ${{ inputs.cache_build_image }}
9797
name: Restore Docker cache (${{ inputs.cache_build_image }})
98-
uses: envoyproxy/toolshed/gh-actions/docker/cache/restore@actions-v0.0.18
98+
uses: envoyproxy/toolshed/gh-actions/docker/cache/restore@actions-v0.0.27
9999
with:
100100
image_tag: ${{ inputs.cache_build_image }}
101101

@@ -108,7 +108,7 @@ jobs:
108108
- if: ${{ steps.context.outputs.use_appauth == 'true' }}
109109
name: Fetch token for app auth
110110
id: appauth
111-
uses: envoyproxy/toolshed/gh-actions/appauth@actions-v0.0.18
111+
uses: envoyproxy/toolshed/gh-actions/appauth@actions-v0.0.27
112112
with:
113113
app_id: ${{ secrets.app_id }}
114114
key: ${{ secrets.app_key }}
@@ -138,15 +138,15 @@ jobs:
138138
run: git config --global --add safe.directory /__w/envoy/envoy
139139

140140
- if: ${{ inputs.diskspace_hack }}
141-
uses: envoyproxy/toolshed/gh-actions/diskspace@actions-v0.0.18
141+
uses: envoyproxy/toolshed/gh-actions/diskspace@actions-v0.0.27
142142
- run: |
143143
echo "disk space at beginning of build:"
144144
df -h
145145
name: "Check disk space at beginning"
146146
147147
- if: ${{ inputs.run_pre }}
148148
name: Run pre action ${{ inputs.run_pre && format('({0})', inputs.run_pre) || '' }}
149-
uses: envoyproxy/toolshed/gh-actions/using/recurse@actions-v0.0.18
149+
uses: envoyproxy/toolshed/gh-actions/using/recurse@actions-v0.0.27
150150
with:
151151
uses: ${{ inputs.run_pre }}
152152
with: ${{ inputs.run_pre_with }}
@@ -170,7 +170,7 @@ jobs:
170170

171171
- if: ${{ inputs.run_post }}
172172
name: Run post action ${{ inputs.run_pre && format('({0})', inputs.run_post) || '' }}
173-
uses: envoyproxy/toolshed/gh-actions/using/recurse@actions-v0.0.18
173+
uses: envoyproxy/toolshed/gh-actions/using/recurse@actions-v0.0.27
174174
with:
175175
uses: ${{ inputs.run_post }}
176176
with: ${{ inputs.run_post_with }}

.github/workflows/_env.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,17 @@ on:
1212
default: envoyproxy/envoy-build-ubuntu
1313
build_image_sha:
1414
type: string
15-
default: 3c8a3ce6f90dcfb5d09dc8f79bb01404d3526d420061f9a176e0a8e91e1e573e
15+
default: 8781bc7e431b754c142edbfc937905fdf343db91f3fe19bbf54c362828db9849
1616
build_image_mobile_sha:
1717
type: string
18-
default: f47fb698cfda583769b9d28e8d1c58cfc7774d5da4f31cd8190d8975c3850c7e
18+
default: 292273a428ebb093cc69c2f225c7c4218ff2ea84e0cb6ee80e7a6771a09e026f
1919
# this is authoritative, but is not currently used in github ci
2020
build_image_gcr_sha:
2121
type: string
22-
default: 2a473cd9808182735d54e03b158975389948b9559b8e8fc624cfafbaf7059e62
22+
default: af98298b715958527d3c3b42ae968a09223d237c843e129c586b7e76b8c69a0d
2323
build_image_tag:
2424
type: string
25-
default: fdd65c6270a8507a18d5acd6cf19a18cb695e4fa
25+
default: 7467652575122d8d54e767a68f141598bd855383
2626

2727
check_mobile_run:
2828
type: boolean

.github/workflows/_stage_publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ jobs:
116116
needs:
117117
- publish
118118
steps:
119-
- uses: envoyproxy/toolshed/gh-actions/dispatch@actions-v0.0.18
119+
- uses: envoyproxy/toolshed/gh-actions/dispatch@actions-v0.0.27
120120
with:
121121
app_id: ${{ secrets.ENVOY_CI_SYNC_APP_ID }}
122122
key: "${{ secrets.ENVOY_CI_SYNC_APP_KEY }}"

.github/workflows/_workflow-start.yml

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

3030
- if: ${{ steps.env.outputs.trusted != 'true' }}
3131
name: Start status check
32-
uses: envoyproxy/toolshed/gh-actions/status@actions-v0.0.18
32+
uses: envoyproxy/toolshed/gh-actions/status@actions-v0.0.27
3333
with:
3434
authToken: ${{ secrets.GITHUB_TOKEN }}
3535
context: ${{ inputs.workflow_name }}

.github/workflows/codeql-push.yml

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

2727
steps:
2828
- name: Pre-cleanup
29-
uses: envoyproxy/toolshed/gh-actions/diskspace@actions-v0.0.18
29+
uses: envoyproxy/toolshed/gh-actions/diskspace@actions-v0.0.27
3030
with:
3131
to_remove: |
3232
/usr/local/lib/android

.github/workflows/commands.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
actions: write
2525
checks: read
2626
steps:
27-
- uses: envoyproxy/toolshed/gh-actions/retest@actions-v0.0.18
27+
- uses: envoyproxy/toolshed/gh-actions/retest@actions-v0.0.27
2828
with:
2929
token: ${{ secrets.GITHUB_TOKEN }}
3030
azp_org: cncf

0 commit comments

Comments
 (0)