Skip to content

Commit 724b33a

Browse files
authored
Updating Envoy version to ee9df7b (2025-11-16T17:51:21Z) (#1459)
See envoyproxy/envoy@ee9df7b, See https://github.com/envoyproxy/envoy/compare/ad4ddf25a621373b08bef6a3623d365ede89bd9d..ee9df7b308de9f7e998619d1c86bc87b9058d0c9. There are significant changes to .bazelrc and more coming down the pipe, but pending input on how we want to update Nighthawk's CI process before we move closer than the current commit. Signed-off-by: Elizabeth Byerly <[email protected]>
1 parent a97931d commit 724b33a

File tree

6 files changed

+41
-27
lines changed

6 files changed

+41
-27
lines changed

.bazelrc

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@
22
# This is necessary since this needs to be available before we can access # unique
33
# the Envoy repository contents via Bazel. # unique
44
# unique
5-
build:asan --test_timeout=900 # unique
6-
build:tsan --test_timeout=3600 # unique
5+
build:asan --test_timeout=4800 # unique
6+
build:tsan --test_timeout=4800 # unique
7+
build:test_gcc --test_timeout=4800 # unique
78
# See https://github.com/envoyproxy/nighthawk/issues/405 # unique
89
build:macos --copt -UDEBUG # unique
910
# unique
@@ -18,6 +19,7 @@ build:macos --copt -UDEBUG
1819
# The number 3G is chosen heuristically to both support large VM and small VM with RBE.
1920
# Startup options cannot be selected via config.
2021
# TODO: Adding just to test android
22+
startup --host_jvm_args=-Xmx3g
2123
startup --host_jvm_args="-DBAZEL_TRACK_SOURCE_DIRECTORIES=1"
2224

2325
common --noenable_bzlmod
@@ -109,15 +111,15 @@ build:sanitizer --linkopt -ldl
109111
test:sanitizer --build_tests_only
110112

111113
# Common flags for Clang (shared between all clang variants)
112-
build:clang-common --action_env=BAZEL_COMPILER=clang
113-
build:clang-common --linkopt=-fuse-ld=lld
114-
build:clang-common --action_env=CC=clang --host_action_env=CC=clang
115-
build:clang-common --action_env=CXX=clang++ --host_action_env=CXX=clang++
116-
build:clang-common --incompatible_enable_cc_toolchain_resolution=false
114+
common:clang-common --action_env=BAZEL_COMPILER=clang
115+
common:clang-common --linkopt=-fuse-ld=lld
116+
common:clang-common --action_env=CC=clang --host_action_env=CC=clang
117+
common:clang-common --action_env=CXX=clang++ --host_action_env=CXX=clang++
118+
common:clang-common --incompatible_enable_cc_toolchain_resolution=false
117119

118120
# Clang with libc++ (default)
119-
build:clang --config=clang-common
120-
build:clang --config=libc++
121+
common:clang --config=clang-common
122+
common:clang --config=libc++
121123

122124
build:arm64-clang --config=clang
123125

@@ -239,13 +241,13 @@ build:msan --test_env=MSAN_SYMBOLIZER_PATH
239241
build:msan --copt -O1
240242
build:msan --copt -fno-optimize-sibling-calls
241243

242-
build:libc++ --action_env=CXXFLAGS=-stdlib=libc++
243-
build:libc++ --action_env=LDFLAGS=-stdlib=libc++
244-
build:libc++ --action_env=BAZEL_CXXOPTS=-stdlib=libc++
245-
build:libc++ --action_env=BAZEL_LINKLIBS=-l%:libc++.a:-l%:libc++abi.a
246-
build:libc++ --action_env=BAZEL_LINKOPTS=-lm:-pthread
247-
build:libc++ --define force_libcpp=enabled
248-
build:libc++ --@envoy//bazel:libc++=true
244+
common:libc++ --action_env=CXXFLAGS=-stdlib=libc++
245+
common:libc++ --action_env=LDFLAGS=-stdlib=libc++
246+
common:libc++ --action_env=BAZEL_CXXOPTS=-stdlib=libc++
247+
common:libc++ --action_env=BAZEL_LINKLIBS=-l%:libc++.a:-l%:libc++abi.a
248+
common:libc++ --action_env=BAZEL_LINKOPTS=-lm:-pthread
249+
common:libc++ --define force_libcpp=enabled
250+
common:libc++ --@envoy//bazel:libc++=true
249251

250252

251253

@@ -402,7 +404,7 @@ build:compile-time-options --@envoy//source/extensions/filters/http/kill_request
402404

403405
# Docker sandbox
404406
# NOTE: Update this from https://github.com/envoyproxy/envoy-build-tools/blob/main/toolchains/rbe_toolchains_config.bzl#L8
405-
build:docker-sandbox --experimental_docker_image=docker.io/envoyproxy/envoy-build-ubuntu:014410eea358648b3493283e0a4cf6db263bb8e2@sha256:007d4c1814628375b5e6e7e030a2d9ff132f5a0deace98c39d32182c7a72899f
407+
build:docker-sandbox --experimental_docker_image=docker.io/envoyproxy/envoy-build-ubuntu:4ce0cb04f941fb89d475597a640176ae64070bb1@sha256:de54e91a8d27623ffbd3fb9bd1aba8241567e41c0fb82b167128e3629c2ede18
406408
build:docker-sandbox --spawn_strategy=docker
407409
build:docker-sandbox --strategy=Javac=docker
408410
build:docker-sandbox --strategy=Closure=docker
@@ -575,7 +577,7 @@ common:bes-envoy-engflow --bes_timeout=3600s
575577
common:bes-envoy-engflow --bes_upload_mode=fully_async
576578
common:bes-envoy-engflow --nolegacy_important_outputs
577579
common:rbe-envoy-engflow --remote_executor=grpcs://mordenite.cluster.engflow.com
578-
common:rbe-envoy-engflow --remote_default_exec_properties=container-image=docker://gcr.io/envoy-ci/envoy-build@sha256:007d4c1814628375b5e6e7e030a2d9ff132f5a0deace98c39d32182c7a72899f
580+
common:rbe-envoy-engflow --remote_default_exec_properties=container-image=docker://gcr.io/envoy-ci/envoy-build@sha256:de54e91a8d27623ffbd3fb9bd1aba8241567e41c0fb82b167128e3629c2ede18
579581
common:rbe-envoy-engflow --jobs=200
580582
common:rbe-envoy-engflow --define=engflow_rbe=true
581583

.bazelversion

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
7.6.2
1+
7.7.1

bazel/repositories.bzl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
22

3-
ENVOY_COMMIT = "ad4ddf25a621373b08bef6a3623d365ede89bd9d"
4-
ENVOY_SHA = "feab0b191867ffc4876618adb552291912a800e0c6d7534a6e4cc953fd9184bf"
3+
ENVOY_COMMIT = "ee9df7b308de9f7e998619d1c86bc87b9058d0c9"
4+
ENVOY_SHA = "583d91fb5c87e1c92b1a75ad1e259fe9e1164515cd714e887eed01c6cb5ec953"
55

66
HDR_HISTOGRAM_C_VERSION = "0.11.8" # June 18th, 2025
77
HDR_HISTOGRAM_C_SHA = "bb95351a6a8b242dc9be1f28562761a84d4cf0a874ffc90a9b630770a6468e94"

ci/docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
x-envoy-build-base: &envoy-build-base
22
image: >-
3-
${ENVOY_BUILD_IMAGE:-docker.io/envoyproxy/envoy-build-ubuntu:f4a881a1205e8e6db1a57162faf3df7aed88eae8@sha256:b10346fe2eee41733dbab0e02322c47a538bf3938d093a5daebad9699860b814}
3+
${ENVOY_BUILD_IMAGE:-docker.io/envoyproxy/envoy-build-ubuntu:4ce0cb04f941fb89d475597a640176ae64070bb1@sha256:de54e91a8d27623ffbd3fb9bd1aba8241567e41c0fb82b167128e3629c2ede18}
44
cpus: ${ENVOY_DOCKER_CPUS:-0}
55
user: root:root
66
working_dir: ${ENVOY_DOCKER_SOURCE_DIR:-/source}

ci/run_envoy_docker.sh

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,8 @@ set -e
44

55
# TODO(phlax): Add a check that a usable version of docker compose is available
66

7-
87
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
98

10-
# Source build SHA information
11-
# shellcheck source=ci/envoy_build_sha.sh
12-
source "${SCRIPT_DIR}/envoy_build_sha.sh"
13-
149
# User/group IDs
1510
USER_UID="$(id -u)"
1611
USER_GID="$(id -g)"
@@ -45,10 +40,24 @@ export DOCKER_COMMAND="${*:-bash}"
4540
COMPOSE_SERVICE="envoy-build"
4641
if [[ -n "$MOUNT_GPG_HOME" ]]; then
4742
COMPOSE_SERVICE="envoy-build-gpg"
43+
ENVOY_BUILD_VARIANT=devtools
4844
elif [[ -n "$ENVOY_DOCKER_IN_DOCKER" ]]; then
45+
ENVOY_BUILD_VARIANT=docker
4946
COMPOSE_SERVICE="envoy-build-dind"
47+
elif [[ -n "$ENVOY_DOCKER_CI" ]]; then
48+
ENVOY_BUILD_VARIANT=ci
49+
else
50+
ENVOY_BUILD_VARIANT=devtools
5051
fi
5152

53+
# Source build SHA information
54+
# shellcheck source=ci/envoy_build_sha.sh
55+
source "${SCRIPT_DIR}/envoy_build_sha.sh"
56+
57+
ENVOY_BUILD_IMAGE="${ENVOY_BUILD_IMAGE:-${BUILD_CONTAINER}}"
58+
59+
export ENVOY_BUILD_IMAGE
60+
5261
exec docker compose \
5362
-f "${SCRIPT_DIR}/docker-compose.yml" \
5463
${ENVOY_DOCKER_PLATFORM:+-p "$ENVOY_DOCKER_PLATFORM"} \

tools/code_format/config.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -229,6 +229,7 @@ paths:
229229
- source/extensions/transport_sockets/internal_upstream
230230
- source/extensions/transport_sockets/tls/cert_validator
231231
- source/extensions/transport_sockets/tcp_stats/config.cc
232+
- source/common/tracing/custom_tag_impl.cc
232233

233234
# Only one C++ file should instantiate grpc_init
234235
grpc_init:
@@ -335,6 +336,8 @@ paths:
335336
# Files in these paths can use std::regex
336337
std_regex:
337338
include:
339+
- contrib/squash/filters/http/source/squash_filter.h
340+
- contrib/squash/filters/http/source/squash_filter.cc
338341
- source/common/common/regex.h
339342
- source/common/common/regex.cc
340343
- source/common/common/utility.cc

0 commit comments

Comments
 (0)