bazel: 1.32 (#371)

* bazel: try 1.32 naively * bazel: extension check * bazel: options from upstream, note the envoy_build_tools no longer existing * bump: upstream for ci changes, warm our cache * envoyproxy/envoy/pull/36171/ abseil moved from external deps * envoy/commit/8d74446c8a3d219572380731bae42ab328426996, benchmarking * changelog * Rename update-to-upstream-envoy-v1.31.yaml to update-to-upstream-envoy-v1.32.yaml
solo-io · Oct 31, 2024 · 0a08871 · 0a08871
1 parent 145e1ce
commit 0a08871
Show file tree

Hide file tree

Showing 11 changed files with 211 additions and 163 deletions.
diff --git a/.bazelrc b/.bazelrc
diff --git a/bazel/extensions/extensions_build_config.bzl b/bazel/extensions/extensions_build_config.bzl
@@ -81,6 +81,7 @@ EXTENSIONS = {
     "envoy.matching.matchers.ip":                       "//source/extensions/matching/input_matchers/ip:config",
     "envoy.matching.matchers.runtime_fraction":         "//source/extensions/matching/input_matchers/runtime_fraction:config",
     "envoy.matching.matchers.cel_matcher":              "//source/extensions/matching/input_matchers/cel_matcher:config",
+    "envoy.matching.matchers.metadata_matcher":         "//source/extensions/matching/input_matchers/metadata:config",
 
     #
     # Network Matchers
@@ -109,6 +110,11 @@ EXTENSIONS = {
     #
     "envoy.matching.inputs.cel_data_input":             "//source/extensions/matching/http/cel_input:cel_input_lib",
 
+    #
+    # Dynamic Metadata Matching Input
+    #
+    "envoy.matching.inputs.dynamic_metadata":           "//source/extensions/matching/http/metadata_input:metadata_input_lib",
+
     #
     # Matching actions
     #
@@ -118,7 +124,7 @@ EXTENSIONS = {
     #
     # StringMatchers
     #
-    # "envoy.string_matcher.lua":                         "//source/extensions/string_matcher/lua:config",
+    "envoy.string_matcher.lua":                         "//source/extensions/string_matcher/lua:config",
 
     #
     # HTTP filters
@@ -170,6 +176,7 @@ EXTENSIONS = {
     "envoy.filters.http.oauth2":                        "//source/extensions/filters/http/oauth2:config",
     "envoy.filters.http.on_demand":                     "//source/extensions/filters/http/on_demand:config",
     "envoy.filters.http.original_src":                  "//source/extensions/filters/http/original_src:config",
+    "envoy.filters.http.proto_message_extraction":       "//source/extensions/filters/http/proto_message_extraction:config",
     "envoy.filters.http.ratelimit":                     "//source/extensions/filters/http/ratelimit:config",
     "envoy.filters.http.rbac":                          "//source/extensions/filters/http/rbac:config",
     "envoy.filters.http.router":                        "//source/extensions/filters/http/router:config",
@@ -218,6 +225,7 @@ EXTENSIONS = {
     "envoy.filters.network.sni_dynamic_forward_proxy":            "//source/extensions/filters/network/sni_dynamic_forward_proxy:config",
     "envoy.filters.network.wasm":                                 "//source/extensions/filters/network/wasm:config",
     "envoy.filters.network.zookeeper_proxy":                      "//source/extensions/filters/network/zookeeper_proxy:config",
+    "envoy.filters.network.generic_proxy":                        "//source/extensions/filters/network/generic_proxy:config",
 
     #
     # UDP filters
@@ -239,7 +247,8 @@ EXTENSIONS = {
 
     "envoy.resource_monitors.fixed_heap":               "//source/extensions/resource_monitors/fixed_heap:config",
     "envoy.resource_monitors.injected_resource":        "//source/extensions/resource_monitors/injected_resource:config",
-    "envoy.resource_monitors.downstream_connections":   "//source/extensions/resource_monitors/downstream_connections:config",
+    "envoy.resource_monitors.global_downstream_max_connections":   "//source/extensions/resource_monitors/downstream_connections:config",
+    "envoy.resource_monitors.cpu_utilization":          "//source/extensions/resource_monitors/cpu_utilization:config",
 
     #
     # Stat sinks
@@ -257,16 +266,15 @@ EXTENSIONS = {
     # Thrift filters
     #
 
-    "envoy.filters.thrift.router":                      "//source/extensions/filters/network/thrift_proxy/router:config",
-    "envoy.filters.thrift.header_to_metadata":          "//source/extensions/filters/network/thrift_proxy/filters/header_to_metadata:config",
+    # "envoy.filters.thrift.router":                      "//source/extensions/filters/network/thrift_proxy/router:config",
+    # "envoy.filters.thrift.header_to_metadata":          "//source/extensions/filters/network/thrift_proxy/filters/header_to_metadata:config",
     # "envoy.filters.thrift.payload_to_metadata":         "//source/extensions/filters/network/thrift_proxy/filters/payload_to_metadata:config",
-    "envoy.filters.thrift.rate_limit":                  "//source/extensions/filters/network/thrift_proxy/filters/ratelimit:config",
+    # "envoy.filters.thrift.rate_limit":                  "//source/extensions/filters/network/thrift_proxy/filters/ratelimit:config",
 
     #
     # Tracers
     #
 
-    "envoy.tracers.dynamic_ot":                         "//source/extensions/tracers/dynamic_ot:config",
     "envoy.tracers.datadog":                            "//source/extensions/tracers/datadog:config",
     "envoy.tracers.zipkin":                             "//source/extensions/tracers/zipkin:config",
     "envoy.tracers.opencensus":                         "//source/extensions/tracers/opencensus:config",
@@ -287,7 +295,7 @@ EXTENSIONS = {
     #
 
     "envoy.tracers.opentelemetry.samplers.always_on":         "//source/extensions/tracers/opentelemetry/samplers/always_on:config",
-    # "envoy.tracers.opentelemetry.samplers.dynatrace":         "//source/extensions/tracers/opentelemetry/samplers/dynatrace:config",
+    "envoy.tracers.opentelemetry.samplers.dynatrace":         "//source/extensions/tracers/opentelemetry/samplers/dynatrace:config",
 
     #
     # Transport sockets
@@ -488,6 +496,7 @@ EXTENSIONS = {
     "envoy.load_balancing_policies.ring_hash":         "//source/extensions/load_balancing_policies/ring_hash:config",
     "envoy.load_balancing_policies.subset":            "//source/extensions/load_balancing_policies/subset:config",
     "envoy.load_balancing_policies.cluster_provided":  "//source/extensions/load_balancing_policies/cluster_provided:config",
+    "envoy.load_balancing_policies.client_side_weighted_round_robin": "//source/extensions/load_balancing_policies/client_side_weighted_round_robin:config",
 
     #
     # HTTP Early Header Mutation
@@ -519,6 +528,13 @@ EXTENSIONS = {
     #
 
     "envoy.router.cluster_specifier_plugin.lua": "//source/extensions/router/cluster_specifiers/lua:config",
+
+    #
+    # Extensions for generic proxy
+    #
+    # "envoy.filters.generic.router":                             "//source/extensions/filters/network/generic_proxy/router:config",
+    # "envoy.generic_proxy.codecs.dubbo":                         "//source/extensions/filters/network/generic_proxy/codecs/dubbo:config",
+    # "envoy.generic_proxy.codecs.http1":                         "//source/extensions/filters/network/generic_proxy/codecs/http1:config",
 }
 
 # These can be changed to ["//visibility:public"], for  downstream builds which

diff --git a/bazel/foreign_cc/0001-ratelimit-filter-state-hits-addend.patch b/bazel/foreign_cc/0001-ratelimit-filter-state-hits-addend.patch
diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl
@@ -66,8 +66,6 @@ def _repository_impl(name, **kwargs):
             )
 
 def envoy_gloo_dependencies():
-    _repository_impl("envoy", patches=[
-        "@envoy_gloo//bazel/foreign_cc:0001-ratelimit-filter-state-hits-addend.patch",
-    ])
+    _repository_impl("envoy", patches=[])
     _repository_impl("json", build_file = "@envoy_gloo//bazel/external:json.BUILD")
     _repository_impl("inja", build_file = "@envoy_gloo//bazel/external:inja.BUILD")
diff --git a/bazel/repository_locations.bzl b/bazel/repository_locations.bzl
@@ -2,8 +2,8 @@ REPOSITORY_LOCATIONS = dict(
     # can't have more than one comment between envoy line and commit line in 
     # order to accommodate `check_extensions_build_config.sh`
     envoy = dict(
-        # envoy v1.31.2++ ci and checksums
-        commit = "418f3b1ab891d14c110132e10178282fdf4c5081",
+        # envoy v1.32.1
+        commit = "f7f0a80edac7e3fd6e37330b7307416c67f954ab",
         remote = "https://github.com/envoyproxy/envoy",
     ),
     inja = dict(

diff --git a/changelog/v1.32.1-patch1/update-to-upstream-envoy-v1.32.yaml b/changelog/v1.32.1-patch1/update-to-upstream-envoy-v1.32.yaml
@@ -0,0 +1,10 @@
+changelog:
+- type: DEPENDENCY_BUMP
+  dependencyOwner: envoyproxy
+  dependencyRepo: envoy
+  dependencyTag: v1.32.1
+  resolvesIssue: false
+  description: >-
+    Update Envoy to v1.32
+  issueLink: https://github.com/solo-io/envoy-gloo-ee/issues/843
+
diff --git a/source/common/matcher/BUILD b/source/common/matcher/BUILD
@@ -15,14 +15,14 @@ envoy_cc_library(
     srcs = ["solo_matcher.cc"],
     hdrs = ["solo_matcher.h"],
     repository = "@envoy",
-    external_deps = ["abseil_optional"],
     deps = [
         "@envoy//source/common/router:config_lib",
         "@envoy//source/common/http:header_utility_lib",
         "@envoy//envoy/common:regex_interface",
         "@envoy_api//envoy/api/v2/route:pkg_cc_proto",
         "@envoy_api//envoy/config/route/v3:pkg_cc_proto",
         "//source/common/regex:regex_lib",
+        "@com_google_absl//absl/types:optional",
     ],
 )
 
diff --git a/source/common/nats/nuid/BUILD b/source/common/nats/nuid/BUILD
@@ -12,7 +12,6 @@ envoy_cc_library(
     name = "nuid_lib",
     srcs = ["nuid.cc"],
     hdrs = ["nuid.h"],
-    external_deps = ["abseil_optional"],
     repository = "@envoy",
     deps = [
         "@envoy//envoy/runtime:runtime_interface",

diff --git a/source/common/nats/streaming/BUILD b/source/common/nats/streaming/BUILD
@@ -59,22 +59,22 @@ envoy_cc_library(
     name = "heartbeat_handler_lib",
     srcs = ["heartbeat_handler.cc"],
     hdrs = ["heartbeat_handler.h"],
-    external_deps = ["abseil_optional"],
     repository = "@envoy",
     deps = [
         "//include/envoy/nats/streaming:inbox_handler_interface",
         "//source/common/nats:message_builder_lib",
+        "@com_google_absl//absl/types:optional",
     ],
 )
 
 envoy_cc_library(
     name = "message_utility_lib",
     srcs = ["message_utility.cc"],
     hdrs = ["message_utility.h"],
-    external_deps = ["abseil_optional"],
     repository = "@envoy",
     deps = [
         "//api/envoy/type/streaming:pkg_cc_proto",
+        "@com_google_absl//absl/types:optional",
     ],
 )
 

diff --git a/source/common/regex/BUILD b/source/common/regex/BUILD
@@ -15,13 +15,13 @@ envoy_cc_library(
     srcs = ["regex.cc"],
     hdrs = ["regex.h"],
     repository = "@envoy",
-    external_deps = ["abseil_optional"],
     deps = [
         # "@envoy//source/common/router:config_lib",
         # "@envoy//source/common/http:header_utility_lib",
         # "@envoy_api//envoy/api/v2/route:pkg_cc_proto",
         # "@envoy_api//envoy/config/route/v3:pkg_cc_proto",
         "@envoy//envoy/common:regex_interface",
+        "@com_google_absl//absl/types:optional",
     ],
 )
 
diff --git a/test/extensions/filters/http/transformation/BUILD b/test/extensions/filters/http/transformation/BUILD
@@ -47,15 +47,13 @@ envoy_gloo_cc_test(
 envoy_cc_test_binary(
     name = "inja_transformer_speed_test",
     srcs = ["inja_transformer_speed_test.cc"],
-    external_deps = [
-        "benchmark",
-    ],
     repository = "@envoy",
     deps = [
         "//source/extensions/filters/http/transformation:inja_transformer_lib",
         "@envoy//test/mocks/http:http_mocks",
         "@envoy//test/mocks/server:server_mocks",
         "@envoy//test/mocks/upstream:upstream_mocks",
+        "@com_github_google_benchmark//:benchmark",
     ],
 )