Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

bazel: reference 1.31 #359

Merged
merged 6 commits into from
Aug 13, 2024
Merged

bazel: reference 1.31 #359

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
627c9cb
bazel: reference new version of upstream
nfuden Aug 1, 2024
cf06f41
envoy/pull/34027: upstream load balancer -> extensions
nfuden Aug 6, 2024
2adc8c6
bazel: rate limit addended didnt merge until 1.32
nfuden Aug 6, 2024
fa2d8cc
extensions: add new, comment out additional non-usable in gloo extens…
nfuden Aug 6, 2024
7a81c7c
commit/6c6518e3b89a666c6d4bb5e891e18fdd606dd925
nfuden Aug 6, 2024
3a4a4d4
bazel: Actually set the rate limiter
nfuden Aug 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 28 additions & 23 deletions bazel/extensions/extensions_build_config.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
# See bazel/README.md for details on how this system works.
MOBILE_PACKAGE_VISIBILITY = ["@envoy//:mobile_library"]
EXTENSIONS = {
#
# Access loggers
Expand Down Expand Up @@ -88,6 +87,7 @@ EXTENSIONS = {
#

"envoy.matching.inputs.application_protocol": "//source/extensions/matching/network/application_protocol:config",
# Ideally these would be split up. We'll do so if anyone cares.
ashishb-solo marked this conversation as resolved.
Show resolved Hide resolved
"envoy.matching.inputs.destination_ip": "//source/extensions/matching/network/common:inputs_lib",
"envoy.matching.inputs.destination_port": "//source/extensions/matching/network/common:inputs_lib",
"envoy.matching.inputs.source_ip": "//source/extensions/matching/network/common:inputs_lib",
Expand All @@ -107,18 +107,18 @@ EXTENSIONS = {
#
# CEL Matching Input
#
# "envoy.matching.inputs.cel_data_input": "//source/extensions/matching/http/cel_input:cel_input_lib",
"envoy.matching.inputs.cel_data_input": "//source/extensions/matching/http/cel_input:cel_input_lib",

#
# Matching actions
#

# "envoy.matching.actions.format_string": "//source/extensions/matching/actions/format_string:config",
"envoy.matching.actions.format_string": "//source/extensions/matching/actions/format_string:config",

#
# StringMatchers
#
# "envoy.string_matcher.lua": "//source/extensions/string_matcher/lua:config",
# "envoy.string_matcher.lua": "//source/extensions/string_matcher/lua:config",

#
# HTTP filters
Expand Down Expand Up @@ -148,7 +148,7 @@ EXTENSIONS = {
"envoy.filters.http.fault": "//source/extensions/filters/http/fault:config",
"envoy.filters.http.file_system_buffer": "//source/extensions/filters/http/file_system_buffer:config",
"envoy.filters.http.gcp_authn": "//source/extensions/filters/http/gcp_authn:config",
# "envoy.filters.http.geoip": "//source/extensions/filters/http/geoip:config",
# "envoy.filters.http.geoip": "//source/extensions/filters/http/geoip:config",
# "envoy.filters.http.grpc_field_extraction": "//source/extensions/filters/http/grpc_field_extraction:config",
"envoy.filters.http.grpc_http1_bridge": "//source/extensions/filters/http/grpc_http1_bridge:config",
"envoy.filters.http.grpc_http1_reverse_bridge": "//source/extensions/filters/http/grpc_http1_reverse_bridge:config",
Expand All @@ -161,7 +161,9 @@ EXTENSIONS = {
"envoy.filters.http.json_to_metadata": "//source/extensions/filters/http/json_to_metadata:config",
"envoy.filters.http.jwt_authn": "//source/extensions/filters/http/jwt_authn:config",
# "envoy.filters.http.rate_limit_quota": "//source/extensions/filters/http/rate_limit_quota:config",
# Disabled by default
# Disabled by default. kill_request is not built into most prebuilt images.
# For instructions for building with disabled-by-default filters enabled, see
# https://github.com/envoyproxy/envoy/blob/main/bazel/README.md#enabling-and-disabling-extensions
"envoy.filters.http.kill_request": "//source/extensions/filters/http/kill_request:kill_request_config",
"envoy.filters.http.local_ratelimit": "//source/extensions/filters/http/local_ratelimit:config",
"envoy.filters.http.lua": "//source/extensions/filters/http/lua:config",
Expand All @@ -174,16 +176,17 @@ EXTENSIONS = {
"envoy.filters.http.set_filter_state": "//source/extensions/filters/http/set_filter_state:config",
"envoy.filters.http.set_metadata": "//source/extensions/filters/http/set_metadata:config",
"envoy.filters.http.tap": "//source/extensions/filters/http/tap:config",
# "envoy.filters.http.thrift_to_metadata": "//source/extensions/filters/http/thrift_to_metadata:config",
"envoy.filters.http.wasm": "//source/extensions/filters/http/wasm:config",
"envoy.filters.http.stateful_session": "//source/extensions/filters/http/stateful_session:config",
# "envoy.filters.http.header_mutation": "//source/extensions/filters/http/header_mutation:config",
"envoy.filters.http.header_mutation": "//source/extensions/filters/http/header_mutation:config",

#
# Listener filters
#

"envoy.filters.listener.http_inspector": "//source/extensions/filters/listener/http_inspector:config",
# "envoy.filters.listener.local_ratelimit": "//source/extensions/filters/listener/local_ratelimit:config",
"envoy.filters.listener.local_ratelimit": "//source/extensions/filters/listener/local_ratelimit:config",
# NOTE: The original_dst filter is implicitly loaded if original_dst functionality is
# configured on the listener. Do not remove it in that case or configs will fail to load.
"envoy.filters.listener.original_dst": "//source/extensions/filters/listener/original_dst:config",
Expand Down Expand Up @@ -236,7 +239,7 @@ 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.downstream_connections": "//source/extensions/resource_monitors/downstream_connections:config",

#
# Stat sinks
Expand All @@ -246,7 +249,7 @@ EXTENSIONS = {
"envoy.stat_sinks.graphite_statsd": "//source/extensions/stat_sinks/graphite_statsd:config",
"envoy.stat_sinks.hystrix": "//source/extensions/stat_sinks/hystrix:config",
"envoy.stat_sinks.metrics_service": "//source/extensions/stat_sinks/metrics_service:config",
# "envoy.stat_sinks.open_telemetry": "//source/extensions/stat_sinks/open_telemetry:config",
"envoy.stat_sinks.open_telemetry": "//source/extensions/stat_sinks/open_telemetry:config",
"envoy.stat_sinks.statsd": "//source/extensions/stat_sinks/statsd:config",
"envoy.stat_sinks.wasm": "//source/extensions/stat_sinks/wasm:config",

Expand Down Expand Up @@ -277,13 +280,14 @@ EXTENSIONS = {

"envoy.tracers.opentelemetry.resource_detectors.environment": "//source/extensions/tracers/opentelemetry/resource_detectors/environment:config",
"envoy.tracers.opentelemetry.resource_detectors.dynatrace": "//source/extensions/tracers/opentelemetry/resource_detectors/dynatrace:config",
"envoy.tracers.opentelemetry.resource_detectors.static_config": "//source/extensions/tracers/opentelemetry/resource_detectors/static:config",

#
# OpenTelemetry tracer samplers
#

"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
Expand Down Expand Up @@ -401,16 +405,18 @@ EXTENSIONS = {
#

"envoy.http.injected_credentials.generic": "//source/extensions/http/injected_credentials/generic:config",
"envoy.http.injected_credentials.oauth2": "//source/extensions/http/injected_credentials/oauth2:config",

#
# QUIC extensions
#

#"envoy.quic.deterministic_connection_id_generator": "//source/extensions/quic/connection_id_generator:envoy_deterministic_connection_id_generator_config",
"envoy.quic.crypto_stream.server.quiche": "//source/extensions/quic/crypto_stream:envoy_quic_default_crypto_server_stream",
"envoy.quic.proof_source.filter_chain": "//source/extensions/quic/proof_source:envoy_quic_default_proof_source",
#"envoy.quic.server_preferred_address.fixed": "//source/extensions/quic/server_preferred_address:fixed_server_preferred_address_config_factory_config",

# "envoy.quic.deterministic_connection_id_generator": "//source/extensions/quic/connection_id_generator:envoy_deterministic_connection_id_generator_config",
# "envoy.quic.crypto_stream.server.quiche": "//source/extensions/quic/crypto_stream:envoy_quic_default_crypto_server_stream",
# "envoy.quic.proof_source.filter_chain": "//source/extensions/quic/proof_source:envoy_quic_default_proof_source",
# "envoy.quic.server_preferred_address.fixed": "//source/extensions/quic/server_preferred_address:fixed_server_preferred_address_config_factory_config",
# "envoy.quic.server_preferred_address.datasource": "//source/extensions/quic/server_preferred_address:datasource_server_preferred_address_config_factory_config",
# "envoy.quic.connection_debug_visitor.basic": "//source/extensions/quic/connection_debug_visitor:envoy_quic_connection_debug_visitor_basic",

#
# UDP packet writers
Expand All @@ -422,7 +428,7 @@ EXTENSIONS = {
# Formatter
#

# "envoy.formatter.cel": "//source/extensions/formatter/cel:config",
"envoy.formatter.cel": "//source/extensions/formatter/cel:config",
"envoy.formatter.metadata": "//source/extensions/formatter/metadata:config",
"envoy.formatter.req_without_query": "//source/extensions/formatter/req_without_query:config",

Expand Down Expand Up @@ -464,9 +470,8 @@ EXTENSIONS = {
#
# Path Pattern Match and Path Pattern Rewrite
#
# "envoy.path.match.uri_template.uri_template_matcher": "//source/extensions/path/match/uri_template:config",
# "envoy.path.rewrite.uri_template.uri_template_rewriter": "//source/extensions/path/rewrite/uri_template:config",

"envoy.path.match.uri_template.uri_template_matcher": "//source/extensions/path/match/uri_template:config",
"envoy.path.rewrite.uri_template.uri_template_rewriter": "//source/extensions/path/rewrite/uri_template:config",
#
# Early Data option
#
Expand All @@ -489,11 +494,9 @@ EXTENSIONS = {
#
# "envoy.http.early_header_mutation.header_mutation": "//source/extensions/http/early_header_mutation/header_mutation:config",


#
# Config Subscription
#

"envoy.config_subscription.rest": "//source/extensions/config_subscription/rest:http_subscription_lib",
"envoy.config_subscription.filesystem": "//source/extensions/config_subscription/filesystem:filesystem_subscription_lib",
"envoy.config_subscription.filesystem_collection": "//source/extensions/config_subscription/filesystem:filesystem_subscription_lib",
Expand All @@ -510,7 +513,7 @@ EXTENSIONS = {
# Geolocation Provider
#
# "envoy.geoip_providers.maxmind": "//source/extensions/geoip_providers/maxmind:config",

#
# cluster specifier plugin
#
Expand All @@ -523,4 +526,6 @@ EXTENSIONS = {
EXTENSION_CONFIG_VISIBILITY = ["//visibility:public"]
EXTENSION_PACKAGE_VISIBILITY = ["//visibility:public"]
CONTRIB_EXTENSION_PACKAGE_VISIBILITY = ["//visibility:public"]
MOBILE_PACKAGE_VISIBILITY = ["//:mobile_library"]

LEGACY_ALWAYSLINK = 1
140 changes: 0 additions & 140 deletions bazel/foreign_cc/0001-otel-exporter-status-code-fix.patch
View file
Open in desktop

This file was deleted.

0 ...-ratelimit-filter-state-hits-addend.patch → ...-ratelimit-filter-state-hits-addend.patch
View file
Open in desktop
File renamed without changes.
3 changes: 1 addition & 2 deletions bazel/repositories.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,7 @@ def _repository_impl(name, **kwargs):

def envoy_gloo_dependencies():
_repository_impl("envoy", patches=[
"@envoy_gloo//bazel/foreign_cc:0001-otel-exporter-status-code-fix.patch",
"@envoy_gloo//bazel/foreign_cc:0002-ratelimit-filter-state-hits-addend.patch",
"@envoy_gloo//bazel/foreign_cc:0001-ratelimit-filter-state-hits-addend.patch",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what's the plan for the hits-addend patch? 0001-ratelimit-filter-state-hits-addend.patch is currently an empty file

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ugh thanks. Yeah thats what reviews are for. Updating

])
_repository_impl("json", build_file = "@envoy_gloo//bazel/external:json.BUILD")
_repository_impl("inja", build_file = "@envoy_gloo//bazel/external:inja.BUILD")
4 changes: 2 additions & 2 deletions bazel/repository_locations.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.30.4
commit = "32113313a357829ba3a5dce0795b6780bf8cbf4d",
# envoy v1.31.0
commit = "7b8baff1758f0a584dcc3cb657b5032000bcb3d7",
remote = "https://github.com/envoyproxy/envoy",
),
inja = dict(
Expand Down
10 changes: 10 additions & 0 deletions changelog/v1.31.0-patch1/update-to-upstream-envoy-v1.31.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
changelog:
- type: DEPENDENCY_BUMP
dependencyOwner: envoyproxy
dependencyRepo: envoy
dependencyTag: v1.31.0
resolvesIssue: false
description: >-
Update Envoy to v1.31
issueLink: https://github.com/solo-io/envoy-gloo-ee/issues/818

2 changes: 1 addition & 1 deletion source/common/matcher/solo_matcher.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ class CompiledStdMatcher : public Regex::CompiledMatcher {

class StdRegexEngine : public Regex::Engine {
public:
Regex::CompiledMatcherPtr matcher(const std::string &regex) const override {
absl::StatusOr<Regex::CompiledMatcherPtr> matcher(const std::string &regex) const override {
return std::make_unique<CompiledStdMatcher>(
Solo::Regex::Utility::parseStdRegex(regex));
}
Expand Down
2 changes: 1 addition & 1 deletion source/common/tcp/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,6 @@ envoy_cc_library(
"@envoy//source/common/common:assert_lib",
"@envoy//source/common/network:filter_lib",
"@envoy//source/common/protobuf:utility_lib",
"@envoy//source/common/upstream:load_balancer_lib",
"@envoy//source/common/upstream:load_balancer_context_base_lib",
],
)
2 changes: 1 addition & 1 deletion source/common/tcp/conn_pool_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#include "source/common/common/assert.h"
#include "source/common/network/filter_impl.h"
#include "source/common/tcp/codec_impl.h"
#include "source/common/upstream/load_balancer_impl.h"
#include "source/common/upstream/load_balancer_context_base.h"

namespace Envoy {
namespace Tcp {
Expand Down
Loading
Loading