diff --git a/source/server/BUILD b/source/server/BUILD index 1efb9e42b30f0..26825d04a6de3 100644 --- a/source/server/BUILD +++ b/source/server/BUILD @@ -385,7 +385,6 @@ envoy_cc_library( "//source/common/protobuf:utility_lib", "//source/common/stats:stats_lib", "//source/common/version:version_lib", - "@envoy_api//envoy/config/bootstrap/v2:pkg_cc_proto", ], ) @@ -601,7 +600,6 @@ envoy_cc_library( "//source/server:overload_manager_lib", "//source/server/admin:admin_lib", "@envoy_api//envoy/admin/v3:pkg_cc_proto", - "@envoy_api//envoy/config/bootstrap/v2:pkg_cc_proto", "@envoy_api//envoy/config/bootstrap/v3:pkg_cc_proto", ], ) diff --git a/source/server/server.cc b/source/server/server.cc index edb9c03045503..8ca82f4909315 100644 --- a/source/server/server.cc +++ b/source/server/server.cc @@ -10,8 +10,6 @@ #include "envoy/admin/v3/config_dump.pb.h" #include "envoy/common/exception.h" #include "envoy/common/time.h" -#include "envoy/config/bootstrap/v2/bootstrap.pb.h" -#include "envoy/config/bootstrap/v2/bootstrap.pb.validate.h" #include "envoy/config/bootstrap/v3/bootstrap.pb.h" #include "envoy/config/bootstrap/v3/bootstrap.pb.validate.h" #include "envoy/event/dispatcher.h" @@ -290,8 +288,6 @@ void loadBootstrap(absl::optional bootstrap_version, load_function(bootstrap, true); } else if (*bootstrap_version == 3) { load_function(bootstrap, false); - } else if (*bootstrap_version == 2) { - throw EnvoyException("v2 bootstrap is deprecated and no longer supported."); } else { throw EnvoyException(fmt::format("Unknown bootstrap version {}.", *bootstrap_version)); } diff --git a/test/server/server_test.cc b/test/server/server_test.cc index 115953df50d49..6ccd6b64da714 100644 --- a/test/server/server_test.cc +++ b/test/server/server_test.cc @@ -1183,15 +1183,6 @@ TEST_P(ServerInstanceImplTest, InvalidBootstrapVersion) { EnvoyException, "Unknown bootstrap version 1."); } -// Validate that we always reject v2. -TEST_P(ServerInstanceImplTest, InvalidV2Bootstrap) { - options_.bootstrap_version_ = 2; - - EXPECT_THROW_WITH_REGEX( - initialize("test/server/test_data/server/valid_v2_but_invalid_v3_bootstrap.pb_text"), - EnvoyException, "v2 bootstrap is deprecated and no longer supported."); -} - TEST_P(ServerInstanceImplTest, LoadsBootstrapFromConfigProtoOptions) { options_.config_proto_.mutable_node()->set_id("foo"); initialize("test/server/test_data/server/node_bootstrap.yaml");