Skip to content

Commit

Permalink
Update Envoy to da1a7d2 (Mar 08, 2024). (#1092)
Browse files Browse the repository at this point in the history
- synced up `.bazelrc`, `tools/code_format/config.yaml` from Envoy's version.
- no changes to `.bazelversion`, `ci/run_envoy_docker.sh`, `tools/gen_compilation_database.py`.
- adjusting our usage of TLS after envoyproxy/envoy#32368.

Signed-off-by: Jakub Sobon <[email protected]>
  • Loading branch information
mum4k authored Mar 10, 2024
1 parent cb40a6c commit c64046d
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 6 deletions.
3 changes: 2 additions & 1 deletion .bazelrc
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ build:clang-asan --linkopt --rtlib=compiler-rt
build:clang-asan --linkopt --unwindlib=libgcc

# macOS
build:linux --cxxopt=-std=c++20 --host_cxxopt=-std=c++20
build:macos --cxxopt=-std=c++20 --host_cxxopt=-std=c++20
build:macos --action_env=PATH=/opt/homebrew/bin:/opt/local/bin:/usr/local/bin:/usr/bin:/bin
build:macos --host_action_env=PATH=/opt/homebrew/bin:/opt/local/bin:/usr/local/bin:/usr/bin:/bin
build:macos --define tcmalloc=disabled
Expand Down Expand Up @@ -520,6 +520,7 @@ build:rbe-engflow --grpc_keepalive_time=30s
build:rbe-engflow --remote_timeout=3600s
build:rbe-engflow --bes_timeout=3600s
build:rbe-engflow --bes_upload_mode=fully_async
build:rbe-engflow --nolegacy_important_outputs

build:cache-envoy-engflow --google_default_credentials=false
build:cache-envoy-engflow --remote_cache=grpcs://morganite.cluster.engflow.com
Expand Down
4 changes: 2 additions & 2 deletions bazel/repositories.bzl
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")

ENVOY_COMMIT = "e28e0d67fc9f9f677b644f940320c5c01bf057c9"
ENVOY_SHA = "b37f2e2eee9c7b1dd8f0eac76f0e086675e919d8e298fd3fac5d8d03128900d1"
ENVOY_COMMIT = "da1a7d2ed07c6c60e7e0b05430337465ed91a03e"
ENVOY_SHA = "a1c180a8710ff8df298bc04db6207e6055d2558dc0c26a93a6cbb85c0ab090ff"

HDR_HISTOGRAM_C_VERSION = "0.11.2" # October 12th, 2020
HDR_HISTOGRAM_C_SHA = "637f28b5f64de2e268131e4e34e6eef0b91cf5ff99167db447d9b2825eae6bad"
Expand Down
2 changes: 1 addition & 1 deletion source/client/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -128,14 +128,14 @@ envoy_cc_library(
"@envoy//source/common/stats:thread_local_store_lib_with_external_headers",
"@envoy//source/common/stream_info:stream_info_lib_with_external_headers",
"@envoy//source/common/thread_local:thread_local_lib_with_external_headers",
"@envoy//source/common/tls:context_lib_with_external_headers",
"@envoy//source/common/tracing:tracer_lib_with_external_headers",
"@envoy//source/common/upstream:cluster_manager_lib_with_external_headers",
"@envoy//source/exe:all_extensions_lib_with_external_headers",
"@envoy//source/exe:platform_header_lib_with_external_headers",
"@envoy//source/exe:platform_impl_lib",
"@envoy//source/exe:process_wide_lib_with_external_headers",
"@envoy//source/extensions/request_id/uuid:config_with_external_headers",
"@envoy//source/extensions/transport_sockets/tls:context_lib_with_external_headers",
"@envoy//source/server:server_lib_with_external_headers",
"@envoy//source/server/config_validation:admin_lib_with_external_headers",
"@envoy_api//envoy/config/core/v3:pkg_cc_proto",
Expand Down
2 changes: 1 addition & 1 deletion source/client/process_impl.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@
#include "external/envoy/source/common/stats/allocator_impl.h"
#include "external/envoy/source/common/stats/thread_local_store.h"
#include "external/envoy/source/common/thread_local/thread_local_impl.h"
#include "external/envoy/source/common/tls/context_manager_impl.h"
#include "external/envoy/source/common/upstream/cluster_manager_impl.h"
#include "external/envoy/source/exe/platform_impl.h"
#include "external/envoy/source/exe/process_wide.h"
#include "external/envoy/source/extensions/transport_sockets/tls/context_manager_impl.h"
#include "external/envoy/source/server/config_validation/admin.h"
#include "external/envoy/source/server/options_impl.h"
#include "external/envoy_api/envoy/config/bootstrap/v3/bootstrap.pb.h"
Expand Down
4 changes: 3 additions & 1 deletion tools/code_format/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,6 @@ paths:
- source/common/stats/tag_extractor_impl.cc
- source/common/stats/tag_producer_impl.cc
- source/common/http/http2/codec_impl.cc
- source/common/http/utility.cc
- source/common/http/hash_policy.cc
- source/common/http/conn_manager_utility.cc
- source/common/http/match_delegate/config.cc
Expand Down Expand Up @@ -172,6 +171,8 @@ paths:
- source/common/ssl/certificate_validation_context_config_impl.cc
- source/common/grpc/google_grpc_creds_impl.cc
- source/common/local_reply/local_reply.cc
- source/common/tls/context_impl.cc
- source/common/tls/context_config_impl.cc

# Only one C++ file should instantiate grpc_init
grpc_init:
Expand Down Expand Up @@ -406,6 +407,7 @@ visibility_excludes:
- source/extensions/filters/network/common/BUILD
- source/extensions/http/header_validators/envoy_default/BUILD
- source/extensions/transport_sockets/common/BUILD
- source/extensions/transport_sockets/tap/BUILD
- source/extensions/udp_packet_writer/default/BUILD
- source/extensions/udp_packet_writer/gso/BUILD
- source/extensions/path/uri_template_lib/BUILD
Expand Down

0 comments on commit c64046d

Please sign in to comment.