Skip to content

Commit f34b30b

Browse files
[protobuf] Update protobuf definitions to v1.22.2 (#243)
Signed-off-by: envoy-bot <[email protected]> Co-authored-by: envoy-bot <[email protected]>
1 parent e5b9700 commit f34b30b

File tree

5 files changed

+10
-7
lines changed

5 files changed

+10
-7
lines changed

api/src/main/proto/envoy/extensions/filters/http/stateful_session/v3/stateful_session.proto

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@ message StatefulSession {
2222
// get address of the upstream host to which the session is assigned.
2323
//
2424
// [#extension-category: envoy.http.stateful_session]
25-
config.core.v3.TypedExtensionConfig session_state = 1
26-
[(validate.rules).message = {required: true}];
25+
config.core.v3.TypedExtensionConfig session_state = 1;
2726
}
2827

2928
message StatefulSessionPerRoute {

api/src/main/proto/envoy/extensions/transport_sockets/tls/v3/common.proto

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -448,8 +448,12 @@ message CertificateValidationContext {
448448
// <envoy_v3_api_field_extensions.transport_sockets.tls.v3.CertificateValidationContext.trusted_ca>`.
449449
repeated SubjectAltNameMatcher match_typed_subject_alt_names = 15;
450450

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

server/src/test/java/io/envoyproxy/controlplane/server/EnvoyContainer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class EnvoyContainer extends GenericContainer<EnvoyContainer> {
2424
EnvoyContainer(String config, Supplier<Integer> controlPlanePortSupplier) {
2525
// this version is changed automatically by /tools/update-sha.sh:57
2626
// if you change it make sure to reflect changes there
27-
super("envoyproxy/envoy-dev:dcd329a2e95b54f754b17aceca3f72724294b502");
27+
super("envoyproxy/envoy-dev:c919bdec19d79e97f4f56e4095706f8e6a383f1c");
2828
this.config = config;
2929
this.controlPlanePortSupplier = controlPlanePortSupplier;
3030
}

tools/API_SHAS

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# Update the versions here and run update-api.sh
22

33
# envoy (source: SHA from https://github.com/envoyproxy/envoy)
4-
ENVOY_SHA="dcd329a2e95b54f754b17aceca3f72724294b502"
4+
ENVOY_SHA="c919bdec19d79e97f4f56e4095706f8e6a383f1c"
55

6-
# dependencies (source: https://github.com/envoyproxy/envoy/blob/dcd329a2e95b54f754b17aceca3f72724294b502/api/bazel/repository_locations.bzl)
6+
# dependencies (source: https://github.com/envoyproxy/envoy/blob/c919bdec19d79e97f4f56e4095706f8e6a383f1c/api/bazel/repository_locations.bzl)
77
GOOGLEAPIS_SHA="82944da21578a53b74e547774cf62ed31a05b841" # 2019-12-02
88
PGV_VERSION="0.6.7" # 2022-03-04
99
PROMETHEUS_SHA="147c58e9608a4f9628b53b6cc863325ca746f63a" # 2021-06-07

tools/envoy_release

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v1.22.0
1+
v1.22.2

0 commit comments

Comments
 (0)