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.

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

Chore/1.34 pre release #404

Draft
wants to merge 22 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
e032fe2
1.33 initial
nfuden Feb 17, 2025
2d59755
create route specific changed signature https://github.com/envoyproxy…
nfuden Feb 17, 2025
a54e4e6
absl or on regex, https://github.com/envoyproxy/envoy/commit/e0c9f1e6…
nfuden Feb 17, 2025
3710215
aws fxn rename https://github.com/envoyproxy/envoy/commit/e0c9f1e650d…
nfuden Feb 17, 2025
e5d530c
aws sig change https://github.com/envoyproxy/envoy/commit/3ae54ec49d9…
nfuden Feb 17, 2025
f1d6314
bazel: update to have new filter changes
nfuden Feb 17, 2025
b8f9ff1
bazel: remove unused patch
nfuden Feb 17, 2025
a96c2de
bazel: ext more
nfuden Feb 17, 2025
6fb3891
protoc version https://github.com/envoyproxy/envoy/commit/b2f7c208e1f…
nfuden Feb 17, 2025
ea082fc
bazel https://github.com/envoyproxy/envoy/commit/a505621d886985c51dfa…
nfuden Feb 17, 2025
626bf20
Merge branch 'chore/1.33' of github.com:solo-io/envoy-gloo into chore…
nfuden Feb 17, 2025
49d9052
bld ext missed line
nfuden Feb 17, 2025
366feeb
rc update
nfuden Feb 17, 2025
3e45268
Merge branch 'chore/1.33' of github.com:solo-io/envoy-gloo into chore…
nfuden Feb 17, 2025
07a5e63
first pass at 1.34 incremental
nfuden Feb 19, 2025
662f2bd
mark nats as no async host https://github.com/envoyproxy/envoy/commit…
nfuden Feb 19, 2025
ab51bd9
Merge branch 'main' into chore/1.34-pre-release
nfuden Feb 19, 2025
22d4bf2
changelog bot and bulldozer require changelogs
nfuden Feb 19, 2025
31729a5
changelog to show its true colors
nfuden Feb 19, 2025
937413c
codgen
nfuden Feb 19, 2025
bd2e2c6
reremove the singleton that gets removed in 1.34
nfuden Feb 19, 2025
7525b18
update test for choosehost
nfuden Feb 19, 2025
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
2 changes: 1 addition & 1 deletion .bazelversion
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7.4.0
7.5.0
3 changes: 3 additions & 0 deletions bazel/extensions/extensions_build_config.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -537,6 +537,9 @@ EXTENSIONS = {
# "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",

# Dynamic mocules
"envoy.filters.http.dynamic_modules": "//source/extensions/filters/http/dynamic_modules:factory_registration",
}

# These can be changed to ["//visibility:public"], for downstream builds which
Expand Down
1,399 changes: 0 additions & 1,399 deletions bazel/foreign_cc/001-tlv-support.patch

This file was deleted.

1 change: 0 additions & 1 deletion bazel/repositories.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ def _repository_impl(name, **kwargs):

def envoy_gloo_dependencies():
_repository_impl("envoy", patches=[
"@envoy_gloo//bazel/foreign_cc:001-tlv-support.patch", #remove in 1.34
])
_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
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.33.0
commit = "b0f43d67aa25c1b03c97186a200cc187f4c22db3",
# envoy v1.34.0-dev
commit = "87b4ae8dde4a0cd35bc8c3584ec79d3625522c4d",
remote = "https://github.com/envoyproxy/envoy",
),
inja = dict(
Expand Down
9 changes: 9 additions & 0 deletions changelog/v1.34.0-patch0/bumpenvoy.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
changelog:
- type: DEPENDENCY_BUMP
issueLink: https://github.com/solo-io/envoy-gloo-ee/issues/887
dependencyOwner: envoyproxy
dependencyRepo: envoy
dependencyTag: 1.34.0
resolvesIssue: false
description: >-
Bumps to a prerelease of envoy 1.34.0 to allow for usage of dynamic modules
2 changes: 1 addition & 1 deletion go/config/filter/http/aws_lambda/v2/aws_lambda.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion go/config/filter/http/nats/streaming/v2/payload.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion go/type/streaming/protocol.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions source/common/matcher/solo_matcher.cc
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,9 @@ class CompiledStdMatcher : public Regex::CompiledMatcher {
public:
CompiledStdMatcher(std::regex &&regex) : regex_(std::move(regex)) {}

// TODO(nfuden) refactor matchers or find a way to get back onto upstream matchers
const std::string& pattern() const override { return EMPTY_STRING; }

// CompiledMatcher
bool match(absl::string_view value) const override {
try {
Expand Down
3 changes: 3 additions & 0 deletions source/common/matcher/solo_matcher.h
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,10 @@ class Matcher {
static MatcherConstPtr
create(const ::envoy::config::route::v3::RouteMatch &match,
Server::Configuration::CommonFactoryContext& context);

};



} // namespace Matcher
} // namespace Envoy
2 changes: 1 addition & 1 deletion source/common/tcp/conn_pool_impl.h
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ template <typename T, typename D> class InstanceImpl : public Instance<T> {
}
LbContextImpl lb_context(hash_key);
Upstream::HostConstSharedPtr host =
cluster->loadBalancer().chooseHost(&lb_context);
Upstream::LoadBalancer::onlyAllowSynchronousHostSelection(cluster->loadBalancer().chooseHost(&lb_context));
if (!host) {
// TODO(talnordan):
// parent_.callbacks_->onFailure("no host");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ AWSLambdaFilterConfigFactory::createFilterFactoryFromProtoTyped(
// the upstream code from attempting to access the method. https://github.com/envoyproxy/envoy/issues/26653
auto chain = std::make_unique<Extensions::Common::Aws::DefaultCredentialsProviderChain>(
server_context.api(), absl::nullopt /* ServerFactoryContextOptRef context */,
server_context.singletonManager(),
// We pass an empty string if we don't have a region
proto_config.has_service_account_credentials() ? proto_config.service_account_credentials().region() : "",
nullptr);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ class ResponseMatcherImpl : public ResponseMatcher {

private:
std::vector<Http::HeaderUtility::HeaderDataPtr> headers_;
absl::optional<Matchers::StringMatcherImpl<envoy::type::matcher::v3::StringMatcher>> response_code_details_match_;
absl::optional<Matchers::StringMatcherImpl> response_code_details_match_;
};

bool ResponseMatcherImpl::matches(
Expand Down
4 changes: 3 additions & 1 deletion test/common/tcp/conn_pool_impl_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -410,7 +410,9 @@ TEST_F(TcpConnPoolImplTest, NoHost) {

T value;
EXPECT_CALL(cm_.thread_local_cluster_.lb_, chooseHost(_))
.WillOnce(Return(nullptr));
.WillOnce(Invoke([] {
return Upstream::HostSelectionResponse{nullptr};
}));
conn_pool_->makeRequest("foo", value);

conn_pool_ = {};
Expand Down
Loading