config/router/tcp_proxy/options: v2 API, boosting and --bootstrap-ver…

…sion CLI removal. (envoyproxy#17724) * config/router/tcp_proxy/options: v2 API, boosting and --boostrap-verison CLI removal. This PR cleans up a bunch of v2 tech debt, including version conversion and API oracle code: * Remove all non-trivial field references to hidden_envoy_deprecated_*. These were primarily in tcp_proxy and router. * Remove boosting, hidden type annotation and the API type oracle. We are now only v3 for both resource and transport API version. * Remove --boostrap-version flag (all boostraps already must be v3). Risk level: High (It's possible there were some runtime guarded or not dependencies on boosting). Testing: Validated test functional coverage when removing hidden_envoy_deprecated_* field tests. Releasing notes: TODO Signed-off-by: Harvey Tuch <[email protected]>
twghu · Aug 24, 2021 · d142c9d · d142c9d
1 parent eb9f3a9
commit d142c9d
Show file tree

Hide file tree

Showing 215 changed files with 751 additions and 4,088 deletions.
diff --git a/api/envoy/admin/v3/server_info.proto b/api/envoy/admin/v3/server_info.proto
@@ -87,9 +87,9 @@ message CommandLineOptions {
     Immediate = 1;
   }
 
-  reserved 12, 20, 21;
+  reserved 12, 20, 21, 29;
 
-  reserved "max_stats", "max_obj_name_len";
+  reserved "max_stats", "max_obj_name_len", "bootstrap_version";
 
   // See :option:`--base-id` for details.
   uint64 base_id = 1;
@@ -178,9 +178,6 @@ message CommandLineOptions {
   // See :option:`--disable-extensions` for details.
   repeated string disabled_extensions = 28;
 
-  // See :option:`--bootstrap-version` for details.
-  uint32 bootstrap_version = 29;
-
   // See :option:`--enable-fine-grain-logging` for details.
   bool enable_fine_grain_logging = 34;
 

diff --git a/api/envoy/admin/v4alpha/server_info.proto b/api/envoy/admin/v4alpha/server_info.proto
diff --git a/configs/envoy_double_proxy.template.yaml b/configs/envoy_double_proxy.template.yaml
@@ -136,11 +136,6 @@ static_resources:
                 address: front-proxy.yourcompany.net
                 port_value: 9400
                 protocol: TCP
-    # There are so few connections going back
-    # that we can get some imbalance. Until we come up
-    # with a better solution just limit the requests
-    # so we can cycle and get better spread.
-    max_requests_per_connection: 25000
     transport_socket:
       name: envoy.transport_sockets.tls
       typed_config:
@@ -161,6 +156,12 @@ static_resources:
         "@type": type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions
         explicit_http_config:
           http2_protocol_options: {}
+        common_http_protocol_options:
+          # There are so few connections going back
+          # that we can get some imbalance. Until we come up
+          # with a better solution just limit the requests
+          # so we can cycle and get better spread.
+          max_requests_per_connection: 25000
   - name: lightstep_saas
     type: LOGICAL_DNS
     lb_policy: ROUND_ROBIN

diff --git a/contrib/kafka/filters/network/test/broker/integration_test/envoy_config_yaml.j2 b/contrib/kafka/filters/network/test/broker/integration_test/envoy_config_yaml.j2
@@ -28,7 +28,6 @@ static_resources:
                 address: 127.0.0.1
                 port_value: {{ data['kafka_real_port'] }}
 admin:
-  access_log_path: /dev/null
   profile_path: /dev/null
   address:
     socket_address: { address: 127.0.0.1, port_value: {{ data['envoy_monitoring_port'] }} }
diff --git a/contrib/rocketmq_proxy/filters/network/test/config_test.cc b/contrib/rocketmq_proxy/filters/network/test/config_test.cc
@@ -20,10 +20,9 @@ namespace RocketmqProxy {
 
 using RocketmqProxyProto = envoy::extensions::filters::network::rocketmq_proxy::v3::RocketmqProxy;
 
-RocketmqProxyProto parseRocketmqProxyFromV3Yaml(const std::string& yaml,
-                                                bool avoid_boosting = true) {
+RocketmqProxyProto parseRocketmqProxyFromV3Yaml(const std::string& yaml) {
   RocketmqProxyProto rocketmq_proxy;
-  TestUtility::loadFromYaml(yaml, rocketmq_proxy, false, avoid_boosting);
+  TestUtility::loadFromYaml(yaml, rocketmq_proxy);
   return rocketmq_proxy;
 }
 

diff --git a/docs/root/configuration/http/http_filters/_include/composite.yaml b/docs/root/configuration/http/http_filters/_include/composite.yaml
@@ -1,5 +1,4 @@
 admin:
-  access_log_path: /tmp/admin_access.log
   address:
     socket_address: {address: 0.0.0.0, port_value: 9901}
 

diff --git a/docs/root/operations/cli.rst b/docs/root/operations/cli.rst
@@ -31,13 +31,6 @@ following are the command line options that Envoy supports.
 
       ./envoy -c bootstrap.yaml --config-yaml "node: {id: 'node1'}"
 
-.. option:: --bootstrap-version <integer>
-
-   *(optional)* The API version to load the bootstrap as. The value should be a single integer, e.g.
-   to parse the bootstrap configuration as V3, specify ``--bootstrap-version 3``. If unset, Envoy will
-   attempt to load the bootstrap as the previous API version and upgrade it to the latest. If that fails,
-   Envoy will attempt to load the configuration as the latest version.
-
 .. option:: --mode <string>
 
   *(optional)* One of the operating modes for Envoy:

diff --git a/docs/root/version_history/current.rst b/docs/root/version_history/current.rst
@@ -5,6 +5,8 @@ Incompatible Behavior Changes
 -----------------------------
 *Changes that are expected to cause an incompatibility if applicable; deployment changes are likely required*
 
+* config: the ``--bootstrap-version`` CLI flag has been removed, Envoy has only been able to accept v3
+  bootstrap configurations since 1.18.0.
 * contrib: the :ref:`squash filter <config_http_filters_squash>` has been moved to
   :ref:`contrib images <install_contrib>`.
 * contrib: the :ref:`kafka broker filter <config_network_filters_kafka_broker>` has been moved to

diff --git a/docs/root/version_history/v1.17.0.rst b/docs/root/version_history/v1.17.0.rst
@@ -5,7 +5,7 @@ Incompatible Behavior Changes
 -----------------------------
 *Changes that are expected to cause an incompatibility if applicable; deployment changes are likely required*
 
-* config: v2 is now fatal-by-default. This may be overridden by setting :option:`--bootstrap-version` 2 on the CLI for a v2 bootstrap file and also enabling the runtime ``envoy.reloadable_features.enable_deprecated_v2_api`` feature.
+* config: v2 is now fatal-by-default. This may be overridden by setting ``--bootstrap-version 2`` on the CLI for a v2 bootstrap file and also enabling the runtime ``envoy.reloadable_features.enable_deprecated_v2_api`` feature.
 
 Minor Behavior Changes
 ----------------------

diff --git a/envoy/config/BUILD b/envoy/config/BUILD
@@ -70,7 +70,6 @@ envoy_cc_library(
     hdrs = ["subscription.h"],
     deps = [
         "//envoy/stats:stats_macros",
-        "//source/common/config:api_type_oracle_lib",
         "//source/common/protobuf",
         "@envoy_api//envoy/service/discovery/v3:pkg_cc_proto",
     ],

diff --git a/envoy/registry/BUILD b/envoy/registry/BUILD
@@ -13,7 +13,6 @@ envoy_cc_library(
     hdrs = ["registry.h"],
     deps = [
         "//source/common/common:assert_lib",
-        "//source/common/config:api_type_oracle_lib",
         "//source/common/protobuf:utility_lib",
         "//source/extensions/common:utility_lib",
         "@envoy_api//envoy/config/core/v3:pkg_cc_proto",

diff --git a/envoy/registry/registry.h b/envoy/registry/registry.h
@@ -13,7 +13,6 @@
 #include "source/common/common/fmt.h"
 #include "source/common/common/logger.h"
 #include "source/common/common/utility.h"
-#include "source/common/config/api_type_oracle.h"
 #include "source/common/protobuf/utility.h"
 #include "source/extensions/common/utility.h"
 
@@ -356,25 +355,16 @@ template <class Base> class FactoryRegistry : public Logger::Loggable<Logger::Id
         continue;
       }
 
-      // Register config types in the mapping and traverse the deprecated message type chain.
-      while (true) {
-        auto it = mapping->find(config_type);
-        if (it != mapping->end() && it->second != factory) {
-          // Mark double-registered types with a nullptr.
-          // See issue https://github.com/envoyproxy/envoy/issues/9643.
-          ENVOY_LOG(warn, "Double registration for type: '{}' by '{}' and '{}'", config_type,
-                    factory->name(), it->second ? it->second->name() : "");
-          it->second = nullptr;
-        } else {
-          mapping->emplace(std::make_pair(config_type, factory));
-        }
-
-        const Protobuf::Descriptor* previous =
-            Config::ApiTypeOracle::getEarlierVersionDescriptor(config_type);
-        if (previous == nullptr) {
-          break;
-        }
-        config_type = previous->full_name();
+      // Register config types in the mapping.
+      auto it = mapping->find(config_type);
+      if (it != mapping->end() && it->second != factory) {
+        // Mark double-registered types with a nullptr.
+        // See issue https://github.com/envoyproxy/envoy/issues/9643.
+        ENVOY_LOG(warn, "Double registration for type: '{}' by '{}' and '{}'", config_type,
+                  factory->name(), it->second ? it->second->name() : "");
+        it->second = nullptr;
+      } else {
+        mapping->emplace(std::make_pair(config_type, factory));
       }
     }
 

diff --git a/envoy/server/options.h b/envoy/server/options.h
@@ -126,11 +126,6 @@ class Options {
    */
   virtual const envoy::config::bootstrap::v3::Bootstrap& configProto() const PURE;
 
-  /**
-   * @return const absl::optional<uint32_t>& the bootstrap version to use, if specified.
-   */
-  virtual const absl::optional<uint32_t>& bootstrapVersion() const PURE;
-
   /**
    * @return bool allow unknown fields in the static configuration?
    */

diff --git a/examples/grpc-bridge/client/envoy-proxy.yaml b/examples/grpc-bridge/client/envoy-proxy.yaml
@@ -38,7 +38,11 @@ static_resources:
     type: LOGICAL_DNS
     dns_lookup_family: V4_ONLY
     lb_policy: ROUND_ROBIN
-    http_protocol_options: {}
+    typed_extension_protocol_options:
+      envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
+        "@type": type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions
+        explicit_http_config:
+          http_protocol_options: {}
     load_assignment:
       cluster_name: backend-proxy
       endpoints:

diff --git a/examples/tls-inspector/envoy.yaml b/examples/tls-inspector/envoy.yaml
@@ -1,5 +1,4 @@
 admin:
-  access_log_path: "/dev/null"
   address:
     socket_address:
       address: 0.0.0.0

diff --git a/examples/udp/envoy.yaml b/examples/udp/envoy.yaml
@@ -28,7 +28,6 @@ static_resources:
                 port_value: 5005
 
 admin:
-  access_log_path: "/dev/null"
   address:
     socket_address:
       address: 0.0.0.0

diff --git a/generated_api_shadow/envoy/admin/v3/server_info.proto b/generated_api_shadow/envoy/admin/v3/server_info.proto
diff --git a/generated_api_shadow/envoy/admin/v4alpha/server_info.proto b/generated_api_shadow/envoy/admin/v4alpha/server_info.proto
diff --git a/source/common/config/BUILD b/source/common/config/BUILD
@@ -8,16 +8,6 @@ licenses(["notice"])  # Apache 2
 
 envoy_package()
 
-envoy_cc_library(
-    name = "api_type_oracle_lib",
-    srcs = ["api_type_oracle.cc"],
-    hdrs = ["api_type_oracle.h"],
-    deps = [
-        "//source/common/protobuf",
-        "@com_github_cncf_udpa//udpa/annotations:pkg_cc_proto",
-    ],
-)
-
 envoy_cc_library(
     name = "api_version_lib",
     hdrs = ["api_version.h"],
@@ -196,7 +186,6 @@ envoy_cc_library(
         ":delta_subscription_state_lib",
         ":grpc_stream_lib",
         ":pausable_ack_queue_lib",
-        ":version_converter_lib",
         ":watch_map_lib",
         ":xds_context_params_lib",
         ":xds_resource_lib",
@@ -217,7 +206,6 @@ envoy_cc_library(
     deps = [
         ":api_version_lib",
         ":decoded_resource_lib",
-        ":version_converter_lib",
         "//envoy/config:subscription_interface",
         "//envoy/event:dispatcher_interface",
         "//source/common/buffer:buffer_lib",
@@ -302,11 +290,7 @@ envoy_cc_library(
 envoy_cc_library(
     name = "resource_name_lib",
     hdrs = ["resource_name.h"],
-    deps = [
-        ":api_type_oracle_lib",
-        "//source/common/common:assert_lib",
-        "@envoy_api//envoy/config/core/v3:pkg_cc_proto",
-    ],
+    deps = ["//source/common/common:assert_lib"],
 )
 
 envoy_cc_library(
@@ -383,8 +367,6 @@ envoy_cc_library(
     srcs = ["utility.cc"],
     hdrs = ["utility.h"],
     deps = [
-        ":api_type_oracle_lib",
-        ":version_converter_lib",
         "//envoy/config:grpc_mux_interface",
         "//envoy/config:subscription_interface",
         "//envoy/local_info:local_info_interface",
@@ -412,20 +394,6 @@ envoy_cc_library(
     ],
 )
 
-envoy_cc_library(
-    name = "version_converter_lib",
-    srcs = ["version_converter.cc"],
-    hdrs = ["version_converter.h"],
-    deps = [
-        ":api_type_oracle_lib",
-        "//source/common/common:assert_lib",
-        "//source/common/protobuf",
-        "//source/common/protobuf:visitor_lib",
-        "//source/common/protobuf:well_known_lib",
-        "@envoy_api//envoy/config/core/v3:pkg_cc_proto",
-    ],
-)
-
 envoy_cc_library(
     name = "watch_map_lib",
     srcs = ["watch_map.cc"],

diff --git a/source/common/config/api_type_oracle.cc b/source/common/config/api_type_oracle.cc