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

[protobuf] Update protobuf definitions to v1.22.2 #243

Merged
merged 1 commit into from
Jun 13, 2022
Merged

[protobuf] Update protobuf definitions to v1.22.2 #243

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 1 addition & 2 deletions api/src/main/proto/envoy/extensions/filters/http/stateful_session/v3/stateful_session.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@ message StatefulSession {
// get address of the upstream host to which the session is assigned.
//
// [#extension-category: envoy.http.stateful_session]
config.core.v3.TypedExtensionConfig session_state = 1
[(validate.rules).message = {required: true}];
config.core.v3.TypedExtensionConfig session_state = 1;
}

message StatefulSessionPerRoute {
Expand Down
6 changes: 5 additions & 1 deletion api/src/main/proto/envoy/extensions/transport_sockets/tls/v3/common.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -448,8 +448,12 @@ message CertificateValidationContext {
// <envoy_v3_api_field_extensions.transport_sockets.tls.v3.CertificateValidationContext.trusted_ca>`.
repeated SubjectAltNameMatcher match_typed_subject_alt_names = 15;

// This field is deprecated in favor of ref:`match_typed_subject_alt_names
// This field is deprecated in favor of
// :ref:`match_typed_subject_alt_names
// <envoy_v3_api_field_extensions.transport_sockets.tls.v3.CertificateValidationContext.match_typed_subject_alt_names>`.
// Note that if both this field and :ref:`match_typed_subject_alt_names
// <envoy_v3_api_field_extensions.transport_sockets.tls.v3.CertificateValidationContext.match_typed_subject_alt_names>`
// are specified, the former (deprecated field) is ignored.
repeated type.matcher.v3.StringMatcher match_subject_alt_names = 9
[deprecated = true, (envoy.annotations.deprecated_at_minor_version) = "3.0"];

Expand Down
2 changes: 1 addition & 1 deletion server/src/test/java/io/envoyproxy/controlplane/server/EnvoyContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class EnvoyContainer extends GenericContainer<EnvoyContainer> {
EnvoyContainer(String config, Supplier<Integer> controlPlanePortSupplier) {
// this version is changed automatically by /tools/update-sha.sh:57
// if you change it make sure to reflect changes there
super("envoyproxy/envoy-dev:dcd329a2e95b54f754b17aceca3f72724294b502");
super("envoyproxy/envoy-dev:c919bdec19d79e97f4f56e4095706f8e6a383f1c");
this.config = config;
this.controlPlanePortSupplier = controlPlanePortSupplier;
}
Expand Down
4 changes: 2 additions & 2 deletions tools/API_SHAS
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# Update the versions here and run update-api.sh

# envoy (source: SHA from https://github.com/envoyproxy/envoy)
ENVOY_SHA="dcd329a2e95b54f754b17aceca3f72724294b502"
ENVOY_SHA="c919bdec19d79e97f4f56e4095706f8e6a383f1c"

# dependencies (source: https://github.com/envoyproxy/envoy/blob/dcd329a2e95b54f754b17aceca3f72724294b502/api/bazel/repository_locations.bzl)
# dependencies (source: https://github.com/envoyproxy/envoy/blob/c919bdec19d79e97f4f56e4095706f8e6a383f1c/api/bazel/repository_locations.bzl)
GOOGLEAPIS_SHA="82944da21578a53b74e547774cf62ed31a05b841" # 2019-12-02
PGV_VERSION="0.6.7" # 2022-03-04
PROMETHEUS_SHA="147c58e9608a4f9628b53b6cc863325ca746f63a" # 2021-06-07
Expand Down
2 changes: 1 addition & 1 deletion tools/envoy_release
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v1.22.0
v1.22.2