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

Add error_state to all config dump resources #14689

Merged
merged 7 commits into from
Jan 22, 2021
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
39 changes: 39 additions & 0 deletions api/envoy/admin/v3/config_dump.proto
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,17 @@ 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.
google.protobuf.Any failed_configuration = 1;

// Time of the latest failed update attempt.
google.protobuf.Timestamp last_update_attempt = 2;

// Details about the last failed update attempt.
string details = 3;

// This is the version of the rejected resource.
string version_info = 4;
lidizheng marked this conversation as resolved.
Show resolved Hide resolved
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this also needs not-implemented-hide.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

}

// This message describes the bootstrap configuration that Envoy was started with. This includes
Expand Down Expand Up @@ -134,6 +138,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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: *error_state*. Same in other comments below.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

// resource along with the reason and timestamp. For successfully updated or
// acknowledged resource, this field should be empty.
UpdateFailureState error_state = 5;
}

Expand Down Expand Up @@ -184,6 +191,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.
lidizheng marked this conversation as resolved.
Show resolved Hide resolved
// 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;
lidizheng marked this conversation as resolved.
Show resolved Hide resolved
}

// This is the :ref:`version_info <envoy_api_field_service.discovery.v3.DiscoveryResponse.version_info>` in the
Expand Down Expand Up @@ -239,6 +252,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.
Expand Down Expand Up @@ -270,6 +289,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";
Expand All @@ -287,6 +307,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.
Expand All @@ -302,6 +328,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";
Expand All @@ -319,6 +346,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.
Expand Down Expand Up @@ -373,6 +406,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.
Expand Down
39 changes: 39 additions & 0 deletions api/envoy/admin/v4alpha/config_dump.proto

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

39 changes: 39 additions & 0 deletions generated_api_shadow/envoy/admin/v3/config_dump.proto

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

Loading