[protobuf] Update protobuf definitions to v1.22.2

Signed-off-by: envoy-bot <envoy-bot@users.noreply.github.com>
envoyproxy · Jun 11, 2022 · bffe588 · bffe588
1 parent e5b9700
commit bffe588
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 7 deletions.
diff --git a/api/src/main/proto/envoy/extensions/filters/http/stateful_session/v3/stateful_session.proto b/api/src/main/proto/envoy/extensions/filters/http/stateful_session/v3/stateful_session.proto
@@ -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 {

diff --git a/api/src/main/proto/envoy/extensions/transport_sockets/tls/v3/common.proto b/api/src/main/proto/envoy/extensions/transport_sockets/tls/v3/common.proto
@@ -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"];
 

diff --git a/server/src/test/java/io/envoyproxy/controlplane/server/EnvoyContainer.java b/server/src/test/java/io/envoyproxy/controlplane/server/EnvoyContainer.java
@@ -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;
   }

diff --git a/tools/API_SHAS b/tools/API_SHAS
@@ -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

diff --git a/tools/envoy_release b/tools/envoy_release
@@ -1 +1 @@
-v1.22.0
+v1.22.2