Skip to content

Commit 546b890

Browse files
sayborasjrajahalme
authored andcommitted
envoy: Sync up with upstream changes
1 parent 2a371f3 commit 546b890

File tree

5 files changed

+37
-10
lines changed

5 files changed

+37
-10
lines changed

.bazelversion

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
6.5.0
1+
7.4.0

ENVOY_VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
envoy-1.32.3
1+
envoy-1.33.0

WORKSPACE

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ ENVOY_REPO = "envoy"
1212
#
1313
# No other line in this file may have ENVOY_SHA followed by an equals sign!
1414
#
15-
# renovate: datasource=github-releases depName=envoyproxy/envoy digestVersion=v1.32.3
16-
ENVOY_SHA = "58bd599ebd5918d4d005de60954fcd2cb00abd95"
15+
# renovate: datasource=github-releases depName=envoyproxy/envoy digestVersion=v1.33.0
16+
ENVOY_SHA = "b0f43d67aa25c1b03c97186a200cc187f4c22db3"
1717

1818
# // clang-format off: unexpected @bazel_tools reference, please indirect via a definition in //bazel
1919
load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")

envoy.bazelrc

+28-4
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
# Startup options cannot be selected via config.
1111
startup --host_jvm_args=-Xmx3g
1212

13+
common --noenable_bzlmod
14+
1315
fetch --color=yes
1416
run --color=yes
1517

@@ -61,9 +63,9 @@ test --experimental_ui_max_stdouterr_bytes=11712829 #default 1048576
6163
# Allow tags to influence execution requirements
6264
common --experimental_allow_tags_propagation
6365

66+
build:linux --copt=-fdebug-types-section
6467
# Enable position independent code (this is the default on macOS and Windows)
6568
# (Workaround for https://github.com/bazelbuild/rules_foreign_cc/issues/421)
66-
build:linux --copt=-fdebug-types-section
6769
build:linux --copt=-fPIC
6870
build:linux --copt=-Wno-deprecated-declarations
6971
build:linux --cxxopt=-std=c++20 --host_cxxopt=-std=c++20
@@ -89,6 +91,7 @@ build:clang --action_env=BAZEL_COMPILER=clang
8991
build:clang --linkopt=-fuse-ld=lld
9092
build:clang --action_env=CC=clang --host_action_env=CC=clang
9193
build:clang --action_env=CXX=clang++ --host_action_env=CXX=clang++
94+
build:clang --incompatible_enable_cc_toolchain_resolution=false
9295

9396
# Flags for Clang + PCH
9497
build:clang-pch --spawn_strategy=local
@@ -99,6 +102,22 @@ build:gcc --linkopt=-fuse-ld=gold --host_linkopt=-fuse-ld=gold
99102
build:gcc --test_env=HEAPCHECK=
100103
build:gcc --action_env=BAZEL_COMPILER=gcc
101104
build:gcc --action_env=CC=gcc --action_env=CXX=g++
105+
# This is to work around a bug in GCC that makes debug-types-section
106+
# option not play well with fission:
107+
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110885
108+
build:gcc --copt=-fno-debug-types-section
109+
# These trigger errors in multiple places both in Envoy dependecies
110+
# and in Envoy code itself when using GCC.
111+
# And in all cases the reports appear to be clear false positives.
112+
build:gcc --copt=-Wno-error=restrict
113+
build:gcc --copt=-Wno-error=uninitialized
114+
build:gcc --cxxopt=-Wno-missing-requires
115+
# We need this because -Wno-missing-requires options is rather new
116+
# in GCC, so flags -Wno-missing-requires exists in GCC 12, but does
117+
# not in GCC 11 and GCC 11 is what is used in docker-gcc
118+
# configuration currently
119+
build:gcc --cxxopt=-Wno-unknown-warning
120+
build:gcc --incompatible_enable_cc_toolchain_resolution=false
102121

103122
# Clang-tidy
104123
# TODO(phlax): enable this, its throwing some errors as well as finding more issues
@@ -146,6 +165,7 @@ build:clang-asan --linkopt=-fsanitize=vptr,function
146165

147166
# macOS
148167
build:macos --cxxopt=-std=c++20 --host_cxxopt=-std=c++20
168+
build:macos --copt=-Wno-deprecated-declarations
149169
build:macos --action_env=PATH=/opt/homebrew/bin:/opt/local/bin:/usr/local/bin:/usr/bin:/bin
150170
build:macos --host_action_env=PATH=/opt/homebrew/bin:/opt/local/bin:/usr/local/bin:/usr/bin:/bin
151171
build:macos --define tcmalloc=disabled
@@ -204,6 +224,7 @@ build:libc++ --action_env=BAZEL_LINKLIBS=-l%:libc++.a:-l%:libc++abi.a
204224
build:libc++ --action_env=BAZEL_LINKOPTS=-lm:-pthread
205225
build:libc++ --define force_libcpp=enabled
206226
build:clang-libc++ --config=libc++
227+
build:clang-libc++ --action_env=ARFLAGS=r
207228

208229
build:libc++20 --config=libc++
209230
# gRPC has a lot of deprecated-enum-enum-conversion warning. Remove once it is addressed
@@ -255,6 +276,7 @@ build:cache-local --remote_cache=grpc://localhost:9092
255276

256277
# Remote execution: https://docs.bazel.build/versions/master/remote-execution.html
257278
build:rbe-toolchain --action_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1
279+
build:rbe-toolchain --incompatible_enable_cc_toolchain_resolution=false
258280

259281
build:rbe-toolchain-clang --config=rbe-toolchain
260282
build:rbe-toolchain-clang --platforms=@envoy//bazel/rbe/toolchains:rbe_linux_clang_platform
@@ -363,7 +385,7 @@ build:compile-time-options --@envoy//source/extensions/filters/http/kill_request
363385

364386
# Docker sandbox
365387
# NOTE: Update this from https://github.com/envoyproxy/envoy-build-tools/blob/main/toolchains/rbe_toolchains_config.bzl#L8
366-
build:docker-sandbox --experimental_docker_image=envoyproxy/envoy-build-ubuntu:f94a38f62220a2b017878b790b6ea98a0f6c5f9c@sha256:2dd96b6f43c08ccabd5f4747fce5854f5f96af509b32e5cf6493f136e9833649
388+
build:docker-sandbox --experimental_docker_image=envoyproxy/envoy-build-ubuntu:d2be0c198feda0c607fa33209da01bf737ef373f@sha256:026fb6710a3e55716cc1aba129f613f9834212d2deb4ea875ac9d2c37ca19aa3
367389
build:docker-sandbox --spawn_strategy=docker
368390
build:docker-sandbox --strategy=Javac=docker
369391
build:docker-sandbox --strategy=Closure=docker
@@ -379,6 +401,8 @@ build:docker-clang-libc++ --config=docker-sandbox
379401
build:docker-clang-libc++ --config=rbe-toolchain-clang-libc++
380402

381403
build:docker-gcc --config=docker-sandbox
404+
build:docker-gcc --config=gcc
405+
382406
build:docker-gcc --config=rbe-toolchain-gcc
383407

384408
build:docker-asan --config=docker-sandbox
@@ -510,8 +534,8 @@ build:rbe-engflow --remote_executor=grpcs://envoy.cluster.engflow.com
510534
build:rbe-engflow --bes_backend=grpcs://envoy.cluster.engflow.com/
511535
build:rbe-engflow --bes_results_url=https://envoy.cluster.engflow.com/invocation/
512536
build:rbe-engflow --credential_helper=*.engflow.com=%workspace%/bazel/engflow-bazel-credential-helper.sh
513-
build:rbe-engflow --grpc_keepalive_time=30s
514-
build:rbe-engflow --remote_timeout=3600s
537+
build:rbe-engflow --grpc_keepalive_time=60s
538+
build:rbe-engflow --grpc_keepalive_timeout=30s
515539
build:rbe-engflow --bes_timeout=3600s
516540
build:rbe-engflow --bes_upload_mode=fully_async
517541
build:rbe-engflow --nolegacy_important_outputs

envoy_build_config/extensions_build_config.bzl

+5-2
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ EXTENSIONS = {
1818
#
1919

2020
# "envoy.clusters.aggregate": "//source/extensions/clusters/aggregate:cluster",
21+
# "envoy.clusters.dns": "//source/extensions/clusters/dns:dns_cluster_lib",
2122
"envoy.clusters.dynamic_forward_proxy": "//source/extensions/clusters/dynamic_forward_proxy:cluster",
2223
"envoy.clusters.eds": "//source/extensions/clusters/eds:eds_lib",
2324
# "envoy.clusters.redis": "//source/extensions/clusters/redis:redis_cluster",
@@ -129,6 +130,7 @@ EXTENSIONS = {
129130
# "envoy.filters.http.adaptive_concurrency": "//source/extensions/filters/http/adaptive_concurrency:config",
130131
# "envoy.filters.http.admission_control": "//source/extensions/filters/http/admission_control:config",
131132
# "envoy.filters.http.alternate_protocols_cache": "//source/extensions/filters/http/alternate_protocols_cache:config",
133+
# "envoy.filters.http.api_key_auth": "//source/extensions/filters/http/api_key_auth:config",
132134
# "envoy.filters.http.aws_lambda": "//source/extensions/filters/http/aws_lambda:config",
133135
# "envoy.filters.http.aws_request_signing": "//source/extensions/filters/http/aws_request_signing:config",
134136
# "envoy.filters.http.bandwidth_limit": "//source/extensions/filters/http/bandwidth_limit:config",
@@ -155,6 +157,7 @@ EXTENSIONS = {
155157
# "envoy.filters.http.grpc_http1_bridge": "//source/extensions/filters/http/grpc_http1_bridge:config",
156158
# "envoy.filters.http.grpc_http1_reverse_bridge": "//source/extensions/filters/http/grpc_http1_reverse_bridge:config",
157159
# "envoy.filters.http.grpc_json_transcoder": "//source/extensions/filters/http/grpc_json_transcoder:config",
160+
# "envoy.filters.http.grpc_json_reverse_transcoder": "//source/extensions/filters/http/grpc_json_reverse_transcoder:config",
158161
"envoy.filters.http.grpc_stats": "//source/extensions/filters/http/grpc_stats:config",
159162
"envoy.filters.http.grpc_web": "//source/extensions/filters/http/grpc_web:config",
160163
# "envoy.filters.http.header_to_metadata": "//source/extensions/filters/http/header_to_metadata:config",
@@ -274,7 +277,6 @@ EXTENSIONS = {
274277

275278
# "envoy.tracers.datadog": "//source/extensions/tracers/datadog:config",
276279
# "envoy.tracers.zipkin": "//source/extensions/tracers/zipkin:config",
277-
# "envoy.tracers.opencensus": "//source/extensions/tracers/opencensus:config",
278280
# "envoy.tracers.xray": "//source/extensions/tracers/xray:config",
279281
# "envoy.tracers.skywalking": "//source/extensions/tracers/skywalking:config",
280282
# "envoy.tracers.opentelemetry": "//source/extensions/tracers/opentelemetry:config",
@@ -416,7 +418,8 @@ EXTENSIONS = {
416418
# "envoy.quic.proof_source.filter_chain": "//source/extensions/quic/proof_source:envoy_quic_default_proof_source",
417419
# "envoy.quic.server_preferred_address.fixed": "//source/extensions/quic/server_preferred_address:fixed_server_preferred_address_config_factory_config",
418420
# "envoy.quic.server_preferred_address.datasource": "//source/extensions/quic/server_preferred_address:datasource_server_preferred_address_config_factory_config",
419-
# "envoy.quic.connection_debug_visitor.basic": "//source/extensions/quic/connection_debug_visitor:envoy_quic_connection_debug_visitor_basic",
421+
# "envoy.quic.connection_debug_visitor.basic": "//source/extensions/quic/connection_debug_visitor/basic:envoy_quic_connection_debug_visitor_basic",
422+
# "envoy.quic.connection_debug_visitor.quic_stats": "//source/extensions/quic/connection_debug_visitor/quic_stats:config",
420423

421424
#
422425
# UDP packet writers

0 commit comments

Comments
 (0)