From 7488ac32c1826d6922ed68895963e8debd144a66 Mon Sep 17 00:00:00 2001 From: Lidi Zheng Date: Wed, 13 Jan 2021 11:10:57 -0800 Subject: [PATCH 1/6] Add error_state to all config dump resouces Signed-off-by: Lidi Zheng --- api/envoy/admin/v3/config_dump.proto | 40 +++++++++++++++++++ api/envoy/admin/v4alpha/config_dump.proto | 40 +++++++++++++++++++ .../envoy/admin/v3/config_dump.proto | 40 +++++++++++++++++++ .../envoy/admin/v4alpha/config_dump.proto | 40 +++++++++++++++++++ 4 files changed, 160 insertions(+) diff --git a/api/envoy/admin/v3/config_dump.proto b/api/envoy/admin/v3/config_dump.proto index 73156697fdb2..eb87dea1e8d0 100644 --- a/api/envoy/admin/v3/config_dump.proto +++ b/api/envoy/admin/v3/config_dump.proto @@ -49,6 +49,8 @@ message UpdateFailureState { "envoy.admin.v2alpha.UpdateFailureState"; // What the component configuration would have been if the update had succeeded. + // This field may not be present on certain implementation of xDS client or + // server due to concerns of overhead. google.protobuf.Any failed_configuration = 1; // Time of the latest failed update attempt. @@ -56,6 +58,9 @@ message UpdateFailureState { // Details about the last failed update attempt. string details = 3; + + // This is the version of the rejected resource. + string version_info = 4; } // This message describes the bootstrap configuration that Envoy was started with. This includes @@ -134,6 +139,9 @@ message ListenersConfigDump { DynamicListenerState draining_state = 4; // Set if the last update failed, cleared after the next successful update. + // The error_state field contains the rejected version of this particular + // resource along with the reason and timestamp. For successfully updated or + // acknowledged resource, this field should be empty. UpdateFailureState error_state = 5; } @@ -184,6 +192,12 @@ message ClustersConfigDump { // The timestamp when the Cluster was last updated. google.protobuf.Timestamp last_updated = 3; + + // Set if the last update failed, cleared after the next successful update. + // The error_state field contains the rejected version of this particular + // resource along with the reason and timestamp. For successfully updated or + // acknowledged resource, this field should be empty. + UpdateFailureState error_state = 4; } // This is the :ref:`version_info ` in the @@ -239,6 +253,12 @@ message RoutesConfigDump { // The timestamp when the Route was last updated. google.protobuf.Timestamp last_updated = 3; + + // Set if the last update failed, cleared after the next successful update. + // The error_state field contains the rejected version of this particular + // resource along with the reason and timestamp. For successfully updated or + // acknowledged resource, this field should be empty. + UpdateFailureState error_state = 4; } // The statically loaded route configs. @@ -270,6 +290,7 @@ message ScopedRoutesConfigDump { google.protobuf.Timestamp last_updated = 3; } + // [#next-free-field: 6] message DynamicScopedRouteConfigs { option (udpa.annotations.versioning).previous_message_type = "envoy.admin.v2alpha.ScopedRoutesConfigDump.DynamicScopedRouteConfigs"; @@ -287,6 +308,12 @@ message ScopedRoutesConfigDump { // The timestamp when the scoped route config set was last updated. google.protobuf.Timestamp last_updated = 4; + + // Set if the last update failed, cleared after the next successful update. + // The error_state field contains the rejected version of this particular + // resource along with the reason and timestamp. For successfully updated or + // acknowledged resource, this field should be empty. + UpdateFailureState error_state = 5; } // The statically loaded scoped route configs. @@ -302,6 +329,7 @@ message SecretsConfigDump { "envoy.admin.v2alpha.SecretsConfigDump"; // DynamicSecret contains secret information fetched via SDS. + // [#next-free-field: 6] message DynamicSecret { option (udpa.annotations.versioning).previous_message_type = "envoy.admin.v2alpha.SecretsConfigDump.DynamicSecret"; @@ -319,6 +347,12 @@ message SecretsConfigDump { // Security sensitive information is redacted (replaced with "[redacted]") for // private keys and passwords in TLS certificates. google.protobuf.Any secret = 4; + + // Set if the last update failed, cleared after the next successful update. + // The error_state field contains the rejected version of this particular + // resource along with the reason and timestamp. For successfully updated or + // acknowledged resource, this field should be empty. + UpdateFailureState error_state = 5; } // StaticSecret specifies statically loaded secret in bootstrap. @@ -373,6 +407,12 @@ message EndpointsConfigDump { // [#not-implemented-hide:] The timestamp when the Endpoint was last updated. google.protobuf.Timestamp last_updated = 3; + + // Set if the last update failed, cleared after the next successful update. + // The error_state field contains the rejected version of this particular + // resource along with the reason and timestamp. For successfully updated or + // acknowledged resource, this field should be empty. + UpdateFailureState error_state = 4; } // The statically loaded endpoint configs. diff --git a/api/envoy/admin/v4alpha/config_dump.proto b/api/envoy/admin/v4alpha/config_dump.proto index 7fed09631d75..701a798a5e10 100644 --- a/api/envoy/admin/v4alpha/config_dump.proto +++ b/api/envoy/admin/v4alpha/config_dump.proto @@ -48,6 +48,8 @@ message UpdateFailureState { option (udpa.annotations.versioning).previous_message_type = "envoy.admin.v3.UpdateFailureState"; // What the component configuration would have been if the update had succeeded. + // This field may not be present on certain implementation of xDS client or + // server due to concerns of overhead. google.protobuf.Any failed_configuration = 1; // Time of the latest failed update attempt. @@ -55,6 +57,9 @@ message UpdateFailureState { // Details about the last failed update attempt. string details = 3; + + // This is the version of the rejected resource. + string version_info = 4; } // This message describes the bootstrap configuration that Envoy was started with. This includes @@ -131,6 +136,9 @@ message ListenersConfigDump { DynamicListenerState draining_state = 4; // Set if the last update failed, cleared after the next successful update. + // The error_state field contains the rejected version of this particular + // resource along with the reason and timestamp. For successfully updated or + // acknowledged resource, this field should be empty. UpdateFailureState error_state = 5; } @@ -180,6 +188,12 @@ message ClustersConfigDump { // The timestamp when the Cluster was last updated. google.protobuf.Timestamp last_updated = 3; + + // Set if the last update failed, cleared after the next successful update. + // The error_state field contains the rejected version of this particular + // resource along with the reason and timestamp. For successfully updated or + // acknowledged resource, this field should be empty. + UpdateFailureState error_state = 4; } // This is the :ref:`version_info ` in the @@ -234,6 +248,12 @@ message RoutesConfigDump { // The timestamp when the Route was last updated. google.protobuf.Timestamp last_updated = 3; + + // Set if the last update failed, cleared after the next successful update. + // The error_state field contains the rejected version of this particular + // resource along with the reason and timestamp. For successfully updated or + // acknowledged resource, this field should be empty. + UpdateFailureState error_state = 4; } // The statically loaded route configs. @@ -265,6 +285,7 @@ message ScopedRoutesConfigDump { google.protobuf.Timestamp last_updated = 3; } + // [#next-free-field: 6] message DynamicScopedRouteConfigs { option (udpa.annotations.versioning).previous_message_type = "envoy.admin.v3.ScopedRoutesConfigDump.DynamicScopedRouteConfigs"; @@ -282,6 +303,12 @@ message ScopedRoutesConfigDump { // The timestamp when the scoped route config set was last updated. google.protobuf.Timestamp last_updated = 4; + + // Set if the last update failed, cleared after the next successful update. + // The error_state field contains the rejected version of this particular + // resource along with the reason and timestamp. For successfully updated or + // acknowledged resource, this field should be empty. + UpdateFailureState error_state = 5; } // The statically loaded scoped route configs. @@ -296,6 +323,7 @@ message SecretsConfigDump { option (udpa.annotations.versioning).previous_message_type = "envoy.admin.v3.SecretsConfigDump"; // DynamicSecret contains secret information fetched via SDS. + // [#next-free-field: 6] message DynamicSecret { option (udpa.annotations.versioning).previous_message_type = "envoy.admin.v3.SecretsConfigDump.DynamicSecret"; @@ -313,6 +341,12 @@ message SecretsConfigDump { // Security sensitive information is redacted (replaced with "[redacted]") for // private keys and passwords in TLS certificates. google.protobuf.Any secret = 4; + + // Set if the last update failed, cleared after the next successful update. + // The error_state field contains the rejected version of this particular + // resource along with the reason and timestamp. For successfully updated or + // acknowledged resource, this field should be empty. + UpdateFailureState error_state = 5; } // StaticSecret specifies statically loaded secret in bootstrap. @@ -375,6 +409,12 @@ message EndpointsConfigDump { // [#not-implemented-hide:] The timestamp when the Endpoint was last updated. google.protobuf.Timestamp last_updated = 3; + + // Set if the last update failed, cleared after the next successful update. + // The error_state field contains the rejected version of this particular + // resource along with the reason and timestamp. For successfully updated or + // acknowledged resource, this field should be empty. + UpdateFailureState error_state = 4; } // The statically loaded endpoint configs. diff --git a/generated_api_shadow/envoy/admin/v3/config_dump.proto b/generated_api_shadow/envoy/admin/v3/config_dump.proto index 73156697fdb2..eb87dea1e8d0 100644 --- a/generated_api_shadow/envoy/admin/v3/config_dump.proto +++ b/generated_api_shadow/envoy/admin/v3/config_dump.proto @@ -49,6 +49,8 @@ message UpdateFailureState { "envoy.admin.v2alpha.UpdateFailureState"; // What the component configuration would have been if the update had succeeded. + // This field may not be present on certain implementation of xDS client or + // server due to concerns of overhead. google.protobuf.Any failed_configuration = 1; // Time of the latest failed update attempt. @@ -56,6 +58,9 @@ message UpdateFailureState { // Details about the last failed update attempt. string details = 3; + + // This is the version of the rejected resource. + string version_info = 4; } // This message describes the bootstrap configuration that Envoy was started with. This includes @@ -134,6 +139,9 @@ message ListenersConfigDump { DynamicListenerState draining_state = 4; // Set if the last update failed, cleared after the next successful update. + // The error_state field contains the rejected version of this particular + // resource along with the reason and timestamp. For successfully updated or + // acknowledged resource, this field should be empty. UpdateFailureState error_state = 5; } @@ -184,6 +192,12 @@ message ClustersConfigDump { // The timestamp when the Cluster was last updated. google.protobuf.Timestamp last_updated = 3; + + // Set if the last update failed, cleared after the next successful update. + // The error_state field contains the rejected version of this particular + // resource along with the reason and timestamp. For successfully updated or + // acknowledged resource, this field should be empty. + UpdateFailureState error_state = 4; } // This is the :ref:`version_info ` in the @@ -239,6 +253,12 @@ message RoutesConfigDump { // The timestamp when the Route was last updated. google.protobuf.Timestamp last_updated = 3; + + // Set if the last update failed, cleared after the next successful update. + // The error_state field contains the rejected version of this particular + // resource along with the reason and timestamp. For successfully updated or + // acknowledged resource, this field should be empty. + UpdateFailureState error_state = 4; } // The statically loaded route configs. @@ -270,6 +290,7 @@ message ScopedRoutesConfigDump { google.protobuf.Timestamp last_updated = 3; } + // [#next-free-field: 6] message DynamicScopedRouteConfigs { option (udpa.annotations.versioning).previous_message_type = "envoy.admin.v2alpha.ScopedRoutesConfigDump.DynamicScopedRouteConfigs"; @@ -287,6 +308,12 @@ message ScopedRoutesConfigDump { // The timestamp when the scoped route config set was last updated. google.protobuf.Timestamp last_updated = 4; + + // Set if the last update failed, cleared after the next successful update. + // The error_state field contains the rejected version of this particular + // resource along with the reason and timestamp. For successfully updated or + // acknowledged resource, this field should be empty. + UpdateFailureState error_state = 5; } // The statically loaded scoped route configs. @@ -302,6 +329,7 @@ message SecretsConfigDump { "envoy.admin.v2alpha.SecretsConfigDump"; // DynamicSecret contains secret information fetched via SDS. + // [#next-free-field: 6] message DynamicSecret { option (udpa.annotations.versioning).previous_message_type = "envoy.admin.v2alpha.SecretsConfigDump.DynamicSecret"; @@ -319,6 +347,12 @@ message SecretsConfigDump { // Security sensitive information is redacted (replaced with "[redacted]") for // private keys and passwords in TLS certificates. google.protobuf.Any secret = 4; + + // Set if the last update failed, cleared after the next successful update. + // The error_state field contains the rejected version of this particular + // resource along with the reason and timestamp. For successfully updated or + // acknowledged resource, this field should be empty. + UpdateFailureState error_state = 5; } // StaticSecret specifies statically loaded secret in bootstrap. @@ -373,6 +407,12 @@ message EndpointsConfigDump { // [#not-implemented-hide:] The timestamp when the Endpoint was last updated. google.protobuf.Timestamp last_updated = 3; + + // Set if the last update failed, cleared after the next successful update. + // The error_state field contains the rejected version of this particular + // resource along with the reason and timestamp. For successfully updated or + // acknowledged resource, this field should be empty. + UpdateFailureState error_state = 4; } // The statically loaded endpoint configs. diff --git a/generated_api_shadow/envoy/admin/v4alpha/config_dump.proto b/generated_api_shadow/envoy/admin/v4alpha/config_dump.proto index 7fed09631d75..701a798a5e10 100644 --- a/generated_api_shadow/envoy/admin/v4alpha/config_dump.proto +++ b/generated_api_shadow/envoy/admin/v4alpha/config_dump.proto @@ -48,6 +48,8 @@ message UpdateFailureState { option (udpa.annotations.versioning).previous_message_type = "envoy.admin.v3.UpdateFailureState"; // What the component configuration would have been if the update had succeeded. + // This field may not be present on certain implementation of xDS client or + // server due to concerns of overhead. google.protobuf.Any failed_configuration = 1; // Time of the latest failed update attempt. @@ -55,6 +57,9 @@ message UpdateFailureState { // Details about the last failed update attempt. string details = 3; + + // This is the version of the rejected resource. + string version_info = 4; } // This message describes the bootstrap configuration that Envoy was started with. This includes @@ -131,6 +136,9 @@ message ListenersConfigDump { DynamicListenerState draining_state = 4; // Set if the last update failed, cleared after the next successful update. + // The error_state field contains the rejected version of this particular + // resource along with the reason and timestamp. For successfully updated or + // acknowledged resource, this field should be empty. UpdateFailureState error_state = 5; } @@ -180,6 +188,12 @@ message ClustersConfigDump { // The timestamp when the Cluster was last updated. google.protobuf.Timestamp last_updated = 3; + + // Set if the last update failed, cleared after the next successful update. + // The error_state field contains the rejected version of this particular + // resource along with the reason and timestamp. For successfully updated or + // acknowledged resource, this field should be empty. + UpdateFailureState error_state = 4; } // This is the :ref:`version_info ` in the @@ -234,6 +248,12 @@ message RoutesConfigDump { // The timestamp when the Route was last updated. google.protobuf.Timestamp last_updated = 3; + + // Set if the last update failed, cleared after the next successful update. + // The error_state field contains the rejected version of this particular + // resource along with the reason and timestamp. For successfully updated or + // acknowledged resource, this field should be empty. + UpdateFailureState error_state = 4; } // The statically loaded route configs. @@ -265,6 +285,7 @@ message ScopedRoutesConfigDump { google.protobuf.Timestamp last_updated = 3; } + // [#next-free-field: 6] message DynamicScopedRouteConfigs { option (udpa.annotations.versioning).previous_message_type = "envoy.admin.v3.ScopedRoutesConfigDump.DynamicScopedRouteConfigs"; @@ -282,6 +303,12 @@ message ScopedRoutesConfigDump { // The timestamp when the scoped route config set was last updated. google.protobuf.Timestamp last_updated = 4; + + // Set if the last update failed, cleared after the next successful update. + // The error_state field contains the rejected version of this particular + // resource along with the reason and timestamp. For successfully updated or + // acknowledged resource, this field should be empty. + UpdateFailureState error_state = 5; } // The statically loaded scoped route configs. @@ -296,6 +323,7 @@ message SecretsConfigDump { option (udpa.annotations.versioning).previous_message_type = "envoy.admin.v3.SecretsConfigDump"; // DynamicSecret contains secret information fetched via SDS. + // [#next-free-field: 6] message DynamicSecret { option (udpa.annotations.versioning).previous_message_type = "envoy.admin.v3.SecretsConfigDump.DynamicSecret"; @@ -313,6 +341,12 @@ message SecretsConfigDump { // Security sensitive information is redacted (replaced with "[redacted]") for // private keys and passwords in TLS certificates. google.protobuf.Any secret = 4; + + // Set if the last update failed, cleared after the next successful update. + // The error_state field contains the rejected version of this particular + // resource along with the reason and timestamp. For successfully updated or + // acknowledged resource, this field should be empty. + UpdateFailureState error_state = 5; } // StaticSecret specifies statically loaded secret in bootstrap. @@ -375,6 +409,12 @@ message EndpointsConfigDump { // [#not-implemented-hide:] The timestamp when the Endpoint was last updated. google.protobuf.Timestamp last_updated = 3; + + // Set if the last update failed, cleared after the next successful update. + // The error_state field contains the rejected version of this particular + // resource along with the reason and timestamp. For successfully updated or + // acknowledged resource, this field should be empty. + UpdateFailureState error_state = 4; } // The statically loaded endpoint configs. From a906bf39244730660a054df6a4d52f10cac84018 Mon Sep 17 00:00:00 2001 From: Lidi Zheng Date: Thu, 14 Jan 2021 13:05:53 -0800 Subject: [PATCH 2/6] Update the comment about the rejected resources Signed-off-by: Lidi Zheng --- api/envoy/admin/v3/config_dump.proto | 5 +++-- api/envoy/admin/v4alpha/config_dump.proto | 5 +++-- generated_api_shadow/envoy/admin/v3/config_dump.proto | 5 +++-- generated_api_shadow/envoy/admin/v4alpha/config_dump.proto | 5 +++-- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/api/envoy/admin/v3/config_dump.proto b/api/envoy/admin/v3/config_dump.proto index eb87dea1e8d0..9d4ea55240f6 100644 --- a/api/envoy/admin/v3/config_dump.proto +++ b/api/envoy/admin/v3/config_dump.proto @@ -49,8 +49,9 @@ message UpdateFailureState { "envoy.admin.v2alpha.UpdateFailureState"; // What the component configuration would have been if the update had succeeded. - // This field may not be present on certain implementation of xDS client or - // server due to concerns of overhead. + // This field may not be populated by xDS clients due to storage overhead. As + // for xDS servers, they may only keep and dump the latest config regardless + // it is accepted or rejected. google.protobuf.Any failed_configuration = 1; // Time of the latest failed update attempt. diff --git a/api/envoy/admin/v4alpha/config_dump.proto b/api/envoy/admin/v4alpha/config_dump.proto index 701a798a5e10..f853a0e25e22 100644 --- a/api/envoy/admin/v4alpha/config_dump.proto +++ b/api/envoy/admin/v4alpha/config_dump.proto @@ -48,8 +48,9 @@ message UpdateFailureState { option (udpa.annotations.versioning).previous_message_type = "envoy.admin.v3.UpdateFailureState"; // What the component configuration would have been if the update had succeeded. - // This field may not be present on certain implementation of xDS client or - // server due to concerns of overhead. + // This field may not be populated by xDS clients due to storage overhead. As + // for xDS servers, they may only keep and dump the latest config regardless + // it is accepted or rejected. google.protobuf.Any failed_configuration = 1; // Time of the latest failed update attempt. diff --git a/generated_api_shadow/envoy/admin/v3/config_dump.proto b/generated_api_shadow/envoy/admin/v3/config_dump.proto index eb87dea1e8d0..9d4ea55240f6 100644 --- a/generated_api_shadow/envoy/admin/v3/config_dump.proto +++ b/generated_api_shadow/envoy/admin/v3/config_dump.proto @@ -49,8 +49,9 @@ message UpdateFailureState { "envoy.admin.v2alpha.UpdateFailureState"; // What the component configuration would have been if the update had succeeded. - // This field may not be present on certain implementation of xDS client or - // server due to concerns of overhead. + // This field may not be populated by xDS clients due to storage overhead. As + // for xDS servers, they may only keep and dump the latest config regardless + // it is accepted or rejected. google.protobuf.Any failed_configuration = 1; // Time of the latest failed update attempt. diff --git a/generated_api_shadow/envoy/admin/v4alpha/config_dump.proto b/generated_api_shadow/envoy/admin/v4alpha/config_dump.proto index 701a798a5e10..f853a0e25e22 100644 --- a/generated_api_shadow/envoy/admin/v4alpha/config_dump.proto +++ b/generated_api_shadow/envoy/admin/v4alpha/config_dump.proto @@ -48,8 +48,9 @@ message UpdateFailureState { option (udpa.annotations.versioning).previous_message_type = "envoy.admin.v3.UpdateFailureState"; // What the component configuration would have been if the update had succeeded. - // This field may not be present on certain implementation of xDS client or - // server due to concerns of overhead. + // This field may not be populated by xDS clients due to storage overhead. As + // for xDS servers, they may only keep and dump the latest config regardless + // it is accepted or rejected. google.protobuf.Any failed_configuration = 1; // Time of the latest failed update attempt. From 5ddce205e45504b1c67ca1cb200977b7e29a4bb6 Mon Sep 17 00:00:00 2001 From: Lidi Zheng Date: Thu, 14 Jan 2021 14:18:32 -0800 Subject: [PATCH 3/6] Remove the comment about xDS server Signed-off-by: Lidi Zheng --- api/envoy/admin/v3/config_dump.proto | 4 +--- api/envoy/admin/v4alpha/config_dump.proto | 4 +--- generated_api_shadow/envoy/admin/v3/config_dump.proto | 4 +--- generated_api_shadow/envoy/admin/v4alpha/config_dump.proto | 4 +--- 4 files changed, 4 insertions(+), 12 deletions(-) diff --git a/api/envoy/admin/v3/config_dump.proto b/api/envoy/admin/v3/config_dump.proto index 9d4ea55240f6..8296539f6c1c 100644 --- a/api/envoy/admin/v3/config_dump.proto +++ b/api/envoy/admin/v3/config_dump.proto @@ -49,9 +49,7 @@ message UpdateFailureState { "envoy.admin.v2alpha.UpdateFailureState"; // What the component configuration would have been if the update had succeeded. - // This field may not be populated by xDS clients due to storage overhead. As - // for xDS servers, they may only keep and dump the latest config regardless - // it is accepted or rejected. + // This field may not be populated by xDS clients due to storage overhead. google.protobuf.Any failed_configuration = 1; // Time of the latest failed update attempt. diff --git a/api/envoy/admin/v4alpha/config_dump.proto b/api/envoy/admin/v4alpha/config_dump.proto index f853a0e25e22..b6269bdf265e 100644 --- a/api/envoy/admin/v4alpha/config_dump.proto +++ b/api/envoy/admin/v4alpha/config_dump.proto @@ -48,9 +48,7 @@ message UpdateFailureState { option (udpa.annotations.versioning).previous_message_type = "envoy.admin.v3.UpdateFailureState"; // What the component configuration would have been if the update had succeeded. - // This field may not be populated by xDS clients due to storage overhead. As - // for xDS servers, they may only keep and dump the latest config regardless - // it is accepted or rejected. + // This field may not be populated by xDS clients due to storage overhead. google.protobuf.Any failed_configuration = 1; // Time of the latest failed update attempt. diff --git a/generated_api_shadow/envoy/admin/v3/config_dump.proto b/generated_api_shadow/envoy/admin/v3/config_dump.proto index 9d4ea55240f6..8296539f6c1c 100644 --- a/generated_api_shadow/envoy/admin/v3/config_dump.proto +++ b/generated_api_shadow/envoy/admin/v3/config_dump.proto @@ -49,9 +49,7 @@ message UpdateFailureState { "envoy.admin.v2alpha.UpdateFailureState"; // What the component configuration would have been if the update had succeeded. - // This field may not be populated by xDS clients due to storage overhead. As - // for xDS servers, they may only keep and dump the latest config regardless - // it is accepted or rejected. + // This field may not be populated by xDS clients due to storage overhead. google.protobuf.Any failed_configuration = 1; // Time of the latest failed update attempt. diff --git a/generated_api_shadow/envoy/admin/v4alpha/config_dump.proto b/generated_api_shadow/envoy/admin/v4alpha/config_dump.proto index f853a0e25e22..b6269bdf265e 100644 --- a/generated_api_shadow/envoy/admin/v4alpha/config_dump.proto +++ b/generated_api_shadow/envoy/admin/v4alpha/config_dump.proto @@ -48,9 +48,7 @@ message UpdateFailureState { option (udpa.annotations.versioning).previous_message_type = "envoy.admin.v3.UpdateFailureState"; // What the component configuration would have been if the update had succeeded. - // This field may not be populated by xDS clients due to storage overhead. As - // for xDS servers, they may only keep and dump the latest config regardless - // it is accepted or rejected. + // This field may not be populated by xDS clients due to storage overhead. google.protobuf.Any failed_configuration = 1; // Time of the latest failed update attempt. From ca3575f11e490fdc208b4ea743b1941a237356ac Mon Sep 17 00:00:00 2001 From: Lidi Zheng Date: Fri, 15 Jan 2021 10:34:34 -0800 Subject: [PATCH 4/6] Add unimplemented yet annotation Signed-off-by: Lidi Zheng --- api/envoy/admin/v3/config_dump.proto | 5 +++++ api/envoy/admin/v4alpha/config_dump.proto | 5 +++++ generated_api_shadow/envoy/admin/v3/config_dump.proto | 5 +++++ generated_api_shadow/envoy/admin/v4alpha/config_dump.proto | 5 +++++ 4 files changed, 20 insertions(+) diff --git a/api/envoy/admin/v3/config_dump.proto b/api/envoy/admin/v3/config_dump.proto index 8296539f6c1c..66515b8c0b28 100644 --- a/api/envoy/admin/v3/config_dump.proto +++ b/api/envoy/admin/v3/config_dump.proto @@ -196,6 +196,7 @@ message ClustersConfigDump { // The error_state field contains the rejected version of this particular // resource along with the reason and timestamp. For successfully updated or // acknowledged resource, this field should be empty. + // [#not-implemented-yet:] UpdateFailureState error_state = 4; } @@ -257,6 +258,7 @@ message RoutesConfigDump { // The error_state field contains the rejected version of this particular // resource along with the reason and timestamp. For successfully updated or // acknowledged resource, this field should be empty. + // [#not-implemented-yet:] UpdateFailureState error_state = 4; } @@ -312,6 +314,7 @@ message ScopedRoutesConfigDump { // The error_state field contains the rejected version of this particular // resource along with the reason and timestamp. For successfully updated or // acknowledged resource, this field should be empty. + // [#not-implemented-yet:] UpdateFailureState error_state = 5; } @@ -351,6 +354,7 @@ message SecretsConfigDump { // The error_state field contains the rejected version of this particular // resource along with the reason and timestamp. For successfully updated or // acknowledged resource, this field should be empty. + // [#not-implemented-yet:] UpdateFailureState error_state = 5; } @@ -411,6 +415,7 @@ message EndpointsConfigDump { // The error_state field contains the rejected version of this particular // resource along with the reason and timestamp. For successfully updated or // acknowledged resource, this field should be empty. + // [#not-implemented-yet:] UpdateFailureState error_state = 4; } diff --git a/api/envoy/admin/v4alpha/config_dump.proto b/api/envoy/admin/v4alpha/config_dump.proto index b6269bdf265e..59d73bfd39c7 100644 --- a/api/envoy/admin/v4alpha/config_dump.proto +++ b/api/envoy/admin/v4alpha/config_dump.proto @@ -192,6 +192,7 @@ message ClustersConfigDump { // The error_state field contains the rejected version of this particular // resource along with the reason and timestamp. For successfully updated or // acknowledged resource, this field should be empty. + // [#not-implemented-yet:] UpdateFailureState error_state = 4; } @@ -252,6 +253,7 @@ message RoutesConfigDump { // The error_state field contains the rejected version of this particular // resource along with the reason and timestamp. For successfully updated or // acknowledged resource, this field should be empty. + // [#not-implemented-yet:] UpdateFailureState error_state = 4; } @@ -307,6 +309,7 @@ message ScopedRoutesConfigDump { // The error_state field contains the rejected version of this particular // resource along with the reason and timestamp. For successfully updated or // acknowledged resource, this field should be empty. + // [#not-implemented-yet:] UpdateFailureState error_state = 5; } @@ -345,6 +348,7 @@ message SecretsConfigDump { // The error_state field contains the rejected version of this particular // resource along with the reason and timestamp. For successfully updated or // acknowledged resource, this field should be empty. + // [#not-implemented-yet:] UpdateFailureState error_state = 5; } @@ -413,6 +417,7 @@ message EndpointsConfigDump { // The error_state field contains the rejected version of this particular // resource along with the reason and timestamp. For successfully updated or // acknowledged resource, this field should be empty. + // [#not-implemented-yet:] UpdateFailureState error_state = 4; } diff --git a/generated_api_shadow/envoy/admin/v3/config_dump.proto b/generated_api_shadow/envoy/admin/v3/config_dump.proto index 8296539f6c1c..66515b8c0b28 100644 --- a/generated_api_shadow/envoy/admin/v3/config_dump.proto +++ b/generated_api_shadow/envoy/admin/v3/config_dump.proto @@ -196,6 +196,7 @@ message ClustersConfigDump { // The error_state field contains the rejected version of this particular // resource along with the reason and timestamp. For successfully updated or // acknowledged resource, this field should be empty. + // [#not-implemented-yet:] UpdateFailureState error_state = 4; } @@ -257,6 +258,7 @@ message RoutesConfigDump { // The error_state field contains the rejected version of this particular // resource along with the reason and timestamp. For successfully updated or // acknowledged resource, this field should be empty. + // [#not-implemented-yet:] UpdateFailureState error_state = 4; } @@ -312,6 +314,7 @@ message ScopedRoutesConfigDump { // The error_state field contains the rejected version of this particular // resource along with the reason and timestamp. For successfully updated or // acknowledged resource, this field should be empty. + // [#not-implemented-yet:] UpdateFailureState error_state = 5; } @@ -351,6 +354,7 @@ message SecretsConfigDump { // The error_state field contains the rejected version of this particular // resource along with the reason and timestamp. For successfully updated or // acknowledged resource, this field should be empty. + // [#not-implemented-yet:] UpdateFailureState error_state = 5; } @@ -411,6 +415,7 @@ message EndpointsConfigDump { // The error_state field contains the rejected version of this particular // resource along with the reason and timestamp. For successfully updated or // acknowledged resource, this field should be empty. + // [#not-implemented-yet:] UpdateFailureState error_state = 4; } diff --git a/generated_api_shadow/envoy/admin/v4alpha/config_dump.proto b/generated_api_shadow/envoy/admin/v4alpha/config_dump.proto index b6269bdf265e..59d73bfd39c7 100644 --- a/generated_api_shadow/envoy/admin/v4alpha/config_dump.proto +++ b/generated_api_shadow/envoy/admin/v4alpha/config_dump.proto @@ -192,6 +192,7 @@ message ClustersConfigDump { // The error_state field contains the rejected version of this particular // resource along with the reason and timestamp. For successfully updated or // acknowledged resource, this field should be empty. + // [#not-implemented-yet:] UpdateFailureState error_state = 4; } @@ -252,6 +253,7 @@ message RoutesConfigDump { // The error_state field contains the rejected version of this particular // resource along with the reason and timestamp. For successfully updated or // acknowledged resource, this field should be empty. + // [#not-implemented-yet:] UpdateFailureState error_state = 4; } @@ -307,6 +309,7 @@ message ScopedRoutesConfigDump { // The error_state field contains the rejected version of this particular // resource along with the reason and timestamp. For successfully updated or // acknowledged resource, this field should be empty. + // [#not-implemented-yet:] UpdateFailureState error_state = 5; } @@ -345,6 +348,7 @@ message SecretsConfigDump { // The error_state field contains the rejected version of this particular // resource along with the reason and timestamp. For successfully updated or // acknowledged resource, this field should be empty. + // [#not-implemented-yet:] UpdateFailureState error_state = 5; } @@ -413,6 +417,7 @@ message EndpointsConfigDump { // The error_state field contains the rejected version of this particular // resource along with the reason and timestamp. For successfully updated or // acknowledged resource, this field should be empty. + // [#not-implemented-yet:] UpdateFailureState error_state = 4; } From c89dd4edf621f47ec02eed806e7f1137a50fc4c4 Mon Sep 17 00:00:00 2001 From: Lidi Zheng Date: Fri, 15 Jan 2021 13:17:42 -0800 Subject: [PATCH 5/6] Correct the not implemented tag Signed-off-by: Lidi Zheng --- api/envoy/admin/v3/config_dump.proto | 10 +++++----- api/envoy/admin/v4alpha/config_dump.proto | 10 +++++----- generated_api_shadow/envoy/admin/v3/config_dump.proto | 10 +++++----- .../envoy/admin/v4alpha/config_dump.proto | 10 +++++----- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/api/envoy/admin/v3/config_dump.proto b/api/envoy/admin/v3/config_dump.proto index 66515b8c0b28..708d248ddd7e 100644 --- a/api/envoy/admin/v3/config_dump.proto +++ b/api/envoy/admin/v3/config_dump.proto @@ -196,7 +196,7 @@ message ClustersConfigDump { // The error_state field contains the rejected version of this particular // resource along with the reason and timestamp. For successfully updated or // acknowledged resource, this field should be empty. - // [#not-implemented-yet:] + // [#not-implemented-hide:] UpdateFailureState error_state = 4; } @@ -258,7 +258,7 @@ message RoutesConfigDump { // The error_state field contains the rejected version of this particular // resource along with the reason and timestamp. For successfully updated or // acknowledged resource, this field should be empty. - // [#not-implemented-yet:] + // [#not-implemented-hide:] UpdateFailureState error_state = 4; } @@ -314,7 +314,7 @@ message ScopedRoutesConfigDump { // The error_state field contains the rejected version of this particular // resource along with the reason and timestamp. For successfully updated or // acknowledged resource, this field should be empty. - // [#not-implemented-yet:] + // [#not-implemented-hide:] UpdateFailureState error_state = 5; } @@ -354,7 +354,7 @@ message SecretsConfigDump { // The error_state field contains the rejected version of this particular // resource along with the reason and timestamp. For successfully updated or // acknowledged resource, this field should be empty. - // [#not-implemented-yet:] + // [#not-implemented-hide:] UpdateFailureState error_state = 5; } @@ -415,7 +415,7 @@ message EndpointsConfigDump { // The error_state field contains the rejected version of this particular // resource along with the reason and timestamp. For successfully updated or // acknowledged resource, this field should be empty. - // [#not-implemented-yet:] + // [#not-implemented-hide:] UpdateFailureState error_state = 4; } diff --git a/api/envoy/admin/v4alpha/config_dump.proto b/api/envoy/admin/v4alpha/config_dump.proto index 59d73bfd39c7..d9310a04178b 100644 --- a/api/envoy/admin/v4alpha/config_dump.proto +++ b/api/envoy/admin/v4alpha/config_dump.proto @@ -192,7 +192,7 @@ message ClustersConfigDump { // The error_state field contains the rejected version of this particular // resource along with the reason and timestamp. For successfully updated or // acknowledged resource, this field should be empty. - // [#not-implemented-yet:] + // [#not-implemented-hide:] UpdateFailureState error_state = 4; } @@ -253,7 +253,7 @@ message RoutesConfigDump { // The error_state field contains the rejected version of this particular // resource along with the reason and timestamp. For successfully updated or // acknowledged resource, this field should be empty. - // [#not-implemented-yet:] + // [#not-implemented-hide:] UpdateFailureState error_state = 4; } @@ -309,7 +309,7 @@ message ScopedRoutesConfigDump { // The error_state field contains the rejected version of this particular // resource along with the reason and timestamp. For successfully updated or // acknowledged resource, this field should be empty. - // [#not-implemented-yet:] + // [#not-implemented-hide:] UpdateFailureState error_state = 5; } @@ -348,7 +348,7 @@ message SecretsConfigDump { // The error_state field contains the rejected version of this particular // resource along with the reason and timestamp. For successfully updated or // acknowledged resource, this field should be empty. - // [#not-implemented-yet:] + // [#not-implemented-hide:] UpdateFailureState error_state = 5; } @@ -417,7 +417,7 @@ message EndpointsConfigDump { // The error_state field contains the rejected version of this particular // resource along with the reason and timestamp. For successfully updated or // acknowledged resource, this field should be empty. - // [#not-implemented-yet:] + // [#not-implemented-hide:] UpdateFailureState error_state = 4; } diff --git a/generated_api_shadow/envoy/admin/v3/config_dump.proto b/generated_api_shadow/envoy/admin/v3/config_dump.proto index 66515b8c0b28..708d248ddd7e 100644 --- a/generated_api_shadow/envoy/admin/v3/config_dump.proto +++ b/generated_api_shadow/envoy/admin/v3/config_dump.proto @@ -196,7 +196,7 @@ message ClustersConfigDump { // The error_state field contains the rejected version of this particular // resource along with the reason and timestamp. For successfully updated or // acknowledged resource, this field should be empty. - // [#not-implemented-yet:] + // [#not-implemented-hide:] UpdateFailureState error_state = 4; } @@ -258,7 +258,7 @@ message RoutesConfigDump { // The error_state field contains the rejected version of this particular // resource along with the reason and timestamp. For successfully updated or // acknowledged resource, this field should be empty. - // [#not-implemented-yet:] + // [#not-implemented-hide:] UpdateFailureState error_state = 4; } @@ -314,7 +314,7 @@ message ScopedRoutesConfigDump { // The error_state field contains the rejected version of this particular // resource along with the reason and timestamp. For successfully updated or // acknowledged resource, this field should be empty. - // [#not-implemented-yet:] + // [#not-implemented-hide:] UpdateFailureState error_state = 5; } @@ -354,7 +354,7 @@ message SecretsConfigDump { // The error_state field contains the rejected version of this particular // resource along with the reason and timestamp. For successfully updated or // acknowledged resource, this field should be empty. - // [#not-implemented-yet:] + // [#not-implemented-hide:] UpdateFailureState error_state = 5; } @@ -415,7 +415,7 @@ message EndpointsConfigDump { // The error_state field contains the rejected version of this particular // resource along with the reason and timestamp. For successfully updated or // acknowledged resource, this field should be empty. - // [#not-implemented-yet:] + // [#not-implemented-hide:] UpdateFailureState error_state = 4; } diff --git a/generated_api_shadow/envoy/admin/v4alpha/config_dump.proto b/generated_api_shadow/envoy/admin/v4alpha/config_dump.proto index 59d73bfd39c7..d9310a04178b 100644 --- a/generated_api_shadow/envoy/admin/v4alpha/config_dump.proto +++ b/generated_api_shadow/envoy/admin/v4alpha/config_dump.proto @@ -192,7 +192,7 @@ message ClustersConfigDump { // The error_state field contains the rejected version of this particular // resource along with the reason and timestamp. For successfully updated or // acknowledged resource, this field should be empty. - // [#not-implemented-yet:] + // [#not-implemented-hide:] UpdateFailureState error_state = 4; } @@ -253,7 +253,7 @@ message RoutesConfigDump { // The error_state field contains the rejected version of this particular // resource along with the reason and timestamp. For successfully updated or // acknowledged resource, this field should be empty. - // [#not-implemented-yet:] + // [#not-implemented-hide:] UpdateFailureState error_state = 4; } @@ -309,7 +309,7 @@ message ScopedRoutesConfigDump { // The error_state field contains the rejected version of this particular // resource along with the reason and timestamp. For successfully updated or // acknowledged resource, this field should be empty. - // [#not-implemented-yet:] + // [#not-implemented-hide:] UpdateFailureState error_state = 5; } @@ -348,7 +348,7 @@ message SecretsConfigDump { // The error_state field contains the rejected version of this particular // resource along with the reason and timestamp. For successfully updated or // acknowledged resource, this field should be empty. - // [#not-implemented-yet:] + // [#not-implemented-hide:] UpdateFailureState error_state = 5; } @@ -417,7 +417,7 @@ message EndpointsConfigDump { // The error_state field contains the rejected version of this particular // resource along with the reason and timestamp. For successfully updated or // acknowledged resource, this field should be empty. - // [#not-implemented-yet:] + // [#not-implemented-hide:] UpdateFailureState error_state = 4; } From 1d318880e4eb8410a5d70ab9a524dbf2e611df5f Mon Sep 17 00:00:00 2001 From: Lidi Zheng Date: Tue, 19 Jan 2021 12:01:37 -0800 Subject: [PATCH 6/6] Add not implemented tag && improve comment Signed-off-by: Lidi Zheng --- api/envoy/admin/v3/config_dump.proto | 13 +++++++------ api/envoy/admin/v4alpha/config_dump.proto | 13 +++++++------ .../envoy/admin/v3/config_dump.proto | 13 +++++++------ .../envoy/admin/v4alpha/config_dump.proto | 13 +++++++------ 4 files changed, 28 insertions(+), 24 deletions(-) diff --git a/api/envoy/admin/v3/config_dump.proto b/api/envoy/admin/v3/config_dump.proto index 708d248ddd7e..b3e5510a700c 100644 --- a/api/envoy/admin/v3/config_dump.proto +++ b/api/envoy/admin/v3/config_dump.proto @@ -59,6 +59,7 @@ message UpdateFailureState { string details = 3; // This is the version of the rejected resource. + // [#not-implemented-hide:] string version_info = 4; } @@ -138,7 +139,7 @@ message ListenersConfigDump { DynamicListenerState draining_state = 4; // Set if the last update failed, cleared after the next successful update. - // The error_state field contains the rejected version of this particular + // The *error_state* field contains the rejected version of this particular // resource along with the reason and timestamp. For successfully updated or // acknowledged resource, this field should be empty. UpdateFailureState error_state = 5; @@ -193,7 +194,7 @@ message ClustersConfigDump { google.protobuf.Timestamp last_updated = 3; // Set if the last update failed, cleared after the next successful update. - // The error_state field contains the rejected version of this particular + // The *error_state* field contains the rejected version of this particular // resource along with the reason and timestamp. For successfully updated or // acknowledged resource, this field should be empty. // [#not-implemented-hide:] @@ -255,7 +256,7 @@ message RoutesConfigDump { google.protobuf.Timestamp last_updated = 3; // Set if the last update failed, cleared after the next successful update. - // The error_state field contains the rejected version of this particular + // The *error_state* field contains the rejected version of this particular // resource along with the reason and timestamp. For successfully updated or // acknowledged resource, this field should be empty. // [#not-implemented-hide:] @@ -311,7 +312,7 @@ message ScopedRoutesConfigDump { google.protobuf.Timestamp last_updated = 4; // Set if the last update failed, cleared after the next successful update. - // The error_state field contains the rejected version of this particular + // The *error_state* field contains the rejected version of this particular // resource along with the reason and timestamp. For successfully updated or // acknowledged resource, this field should be empty. // [#not-implemented-hide:] @@ -351,7 +352,7 @@ message SecretsConfigDump { google.protobuf.Any secret = 4; // Set if the last update failed, cleared after the next successful update. - // The error_state field contains the rejected version of this particular + // The *error_state* field contains the rejected version of this particular // resource along with the reason and timestamp. For successfully updated or // acknowledged resource, this field should be empty. // [#not-implemented-hide:] @@ -412,7 +413,7 @@ message EndpointsConfigDump { google.protobuf.Timestamp last_updated = 3; // Set if the last update failed, cleared after the next successful update. - // The error_state field contains the rejected version of this particular + // The *error_state* field contains the rejected version of this particular // resource along with the reason and timestamp. For successfully updated or // acknowledged resource, this field should be empty. // [#not-implemented-hide:] diff --git a/api/envoy/admin/v4alpha/config_dump.proto b/api/envoy/admin/v4alpha/config_dump.proto index d9310a04178b..3f5610be23e0 100644 --- a/api/envoy/admin/v4alpha/config_dump.proto +++ b/api/envoy/admin/v4alpha/config_dump.proto @@ -58,6 +58,7 @@ message UpdateFailureState { string details = 3; // This is the version of the rejected resource. + // [#not-implemented-hide:] string version_info = 4; } @@ -135,7 +136,7 @@ message ListenersConfigDump { DynamicListenerState draining_state = 4; // Set if the last update failed, cleared after the next successful update. - // The error_state field contains the rejected version of this particular + // The *error_state* field contains the rejected version of this particular // resource along with the reason and timestamp. For successfully updated or // acknowledged resource, this field should be empty. UpdateFailureState error_state = 5; @@ -189,7 +190,7 @@ message ClustersConfigDump { google.protobuf.Timestamp last_updated = 3; // Set if the last update failed, cleared after the next successful update. - // The error_state field contains the rejected version of this particular + // The *error_state* field contains the rejected version of this particular // resource along with the reason and timestamp. For successfully updated or // acknowledged resource, this field should be empty. // [#not-implemented-hide:] @@ -250,7 +251,7 @@ message RoutesConfigDump { google.protobuf.Timestamp last_updated = 3; // Set if the last update failed, cleared after the next successful update. - // The error_state field contains the rejected version of this particular + // The *error_state* field contains the rejected version of this particular // resource along with the reason and timestamp. For successfully updated or // acknowledged resource, this field should be empty. // [#not-implemented-hide:] @@ -306,7 +307,7 @@ message ScopedRoutesConfigDump { google.protobuf.Timestamp last_updated = 4; // Set if the last update failed, cleared after the next successful update. - // The error_state field contains the rejected version of this particular + // The *error_state* field contains the rejected version of this particular // resource along with the reason and timestamp. For successfully updated or // acknowledged resource, this field should be empty. // [#not-implemented-hide:] @@ -345,7 +346,7 @@ message SecretsConfigDump { google.protobuf.Any secret = 4; // Set if the last update failed, cleared after the next successful update. - // The error_state field contains the rejected version of this particular + // The *error_state* field contains the rejected version of this particular // resource along with the reason and timestamp. For successfully updated or // acknowledged resource, this field should be empty. // [#not-implemented-hide:] @@ -414,7 +415,7 @@ message EndpointsConfigDump { google.protobuf.Timestamp last_updated = 3; // Set if the last update failed, cleared after the next successful update. - // The error_state field contains the rejected version of this particular + // The *error_state* field contains the rejected version of this particular // resource along with the reason and timestamp. For successfully updated or // acknowledged resource, this field should be empty. // [#not-implemented-hide:] diff --git a/generated_api_shadow/envoy/admin/v3/config_dump.proto b/generated_api_shadow/envoy/admin/v3/config_dump.proto index 708d248ddd7e..b3e5510a700c 100644 --- a/generated_api_shadow/envoy/admin/v3/config_dump.proto +++ b/generated_api_shadow/envoy/admin/v3/config_dump.proto @@ -59,6 +59,7 @@ message UpdateFailureState { string details = 3; // This is the version of the rejected resource. + // [#not-implemented-hide:] string version_info = 4; } @@ -138,7 +139,7 @@ message ListenersConfigDump { DynamicListenerState draining_state = 4; // Set if the last update failed, cleared after the next successful update. - // The error_state field contains the rejected version of this particular + // The *error_state* field contains the rejected version of this particular // resource along with the reason and timestamp. For successfully updated or // acknowledged resource, this field should be empty. UpdateFailureState error_state = 5; @@ -193,7 +194,7 @@ message ClustersConfigDump { google.protobuf.Timestamp last_updated = 3; // Set if the last update failed, cleared after the next successful update. - // The error_state field contains the rejected version of this particular + // The *error_state* field contains the rejected version of this particular // resource along with the reason and timestamp. For successfully updated or // acknowledged resource, this field should be empty. // [#not-implemented-hide:] @@ -255,7 +256,7 @@ message RoutesConfigDump { google.protobuf.Timestamp last_updated = 3; // Set if the last update failed, cleared after the next successful update. - // The error_state field contains the rejected version of this particular + // The *error_state* field contains the rejected version of this particular // resource along with the reason and timestamp. For successfully updated or // acknowledged resource, this field should be empty. // [#not-implemented-hide:] @@ -311,7 +312,7 @@ message ScopedRoutesConfigDump { google.protobuf.Timestamp last_updated = 4; // Set if the last update failed, cleared after the next successful update. - // The error_state field contains the rejected version of this particular + // The *error_state* field contains the rejected version of this particular // resource along with the reason and timestamp. For successfully updated or // acknowledged resource, this field should be empty. // [#not-implemented-hide:] @@ -351,7 +352,7 @@ message SecretsConfigDump { google.protobuf.Any secret = 4; // Set if the last update failed, cleared after the next successful update. - // The error_state field contains the rejected version of this particular + // The *error_state* field contains the rejected version of this particular // resource along with the reason and timestamp. For successfully updated or // acknowledged resource, this field should be empty. // [#not-implemented-hide:] @@ -412,7 +413,7 @@ message EndpointsConfigDump { google.protobuf.Timestamp last_updated = 3; // Set if the last update failed, cleared after the next successful update. - // The error_state field contains the rejected version of this particular + // The *error_state* field contains the rejected version of this particular // resource along with the reason and timestamp. For successfully updated or // acknowledged resource, this field should be empty. // [#not-implemented-hide:] diff --git a/generated_api_shadow/envoy/admin/v4alpha/config_dump.proto b/generated_api_shadow/envoy/admin/v4alpha/config_dump.proto index d9310a04178b..3f5610be23e0 100644 --- a/generated_api_shadow/envoy/admin/v4alpha/config_dump.proto +++ b/generated_api_shadow/envoy/admin/v4alpha/config_dump.proto @@ -58,6 +58,7 @@ message UpdateFailureState { string details = 3; // This is the version of the rejected resource. + // [#not-implemented-hide:] string version_info = 4; } @@ -135,7 +136,7 @@ message ListenersConfigDump { DynamicListenerState draining_state = 4; // Set if the last update failed, cleared after the next successful update. - // The error_state field contains the rejected version of this particular + // The *error_state* field contains the rejected version of this particular // resource along with the reason and timestamp. For successfully updated or // acknowledged resource, this field should be empty. UpdateFailureState error_state = 5; @@ -189,7 +190,7 @@ message ClustersConfigDump { google.protobuf.Timestamp last_updated = 3; // Set if the last update failed, cleared after the next successful update. - // The error_state field contains the rejected version of this particular + // The *error_state* field contains the rejected version of this particular // resource along with the reason and timestamp. For successfully updated or // acknowledged resource, this field should be empty. // [#not-implemented-hide:] @@ -250,7 +251,7 @@ message RoutesConfigDump { google.protobuf.Timestamp last_updated = 3; // Set if the last update failed, cleared after the next successful update. - // The error_state field contains the rejected version of this particular + // The *error_state* field contains the rejected version of this particular // resource along with the reason and timestamp. For successfully updated or // acknowledged resource, this field should be empty. // [#not-implemented-hide:] @@ -306,7 +307,7 @@ message ScopedRoutesConfigDump { google.protobuf.Timestamp last_updated = 4; // Set if the last update failed, cleared after the next successful update. - // The error_state field contains the rejected version of this particular + // The *error_state* field contains the rejected version of this particular // resource along with the reason and timestamp. For successfully updated or // acknowledged resource, this field should be empty. // [#not-implemented-hide:] @@ -345,7 +346,7 @@ message SecretsConfigDump { google.protobuf.Any secret = 4; // Set if the last update failed, cleared after the next successful update. - // The error_state field contains the rejected version of this particular + // The *error_state* field contains the rejected version of this particular // resource along with the reason and timestamp. For successfully updated or // acknowledged resource, this field should be empty. // [#not-implemented-hide:] @@ -414,7 +415,7 @@ message EndpointsConfigDump { google.protobuf.Timestamp last_updated = 3; // Set if the last update failed, cleared after the next successful update. - // The error_state field contains the rejected version of this particular + // The *error_state* field contains the rejected version of this particular // resource along with the reason and timestamp. For successfully updated or // acknowledged resource, this field should be empty. // [#not-implemented-hide:]