Skip to content

Commit

Permalink
Add UDPA oneof annotation
Browse files Browse the repository at this point in the history
Signed-off-by: Lidi Zheng <lidiz@google.com>
  • Loading branch information
lidizheng committed Sep 16, 2020
1 parent abd2351 commit 5fb88f0
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 12 deletions.
7 changes: 4 additions & 3 deletions api/envoy/service/status/v3/csds.proto
Original file line number Diff line number Diff line change
Expand Up @@ -84,19 +84,20 @@ message ClientStatusRequest {
}

// Detailed config (per xDS) with status.
// [#next-free-field: 7]
// [#next-free-field: 8]
message PerXdsConfig {
option (udpa.annotations.versioning).previous_message_type =
"envoy.service.status.v2.PerXdsConfig";

// Config status generated by management servers. Will not be present if the
// CSDS server is an xDS client.
ConfigStatus status = 1;
ConfigStatus status = 1 [(udpa.annotations.field_migrate).oneof_promotion = "status_config"];

// Client config status is populated by xDS clients. Will not be present if
// the CSDS server is an xDS server. No matter what the client config status
// is, xDS clients should always dump the most recent accepted xDS config.
ClientConfigStatus client_status = 7;
ClientConfigStatus client_status = 7
[(udpa.annotations.field_migrate).oneof_promotion = "status_config"];

oneof per_xds_config {
admin.v3.ListenersConfigDump listener_config = 2;
Expand Down
7 changes: 4 additions & 3 deletions api/envoy/service/status/v4alpha/csds.proto

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

7 changes: 4 additions & 3 deletions generated_api_shadow/envoy/service/status/v3/csds.proto

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

7 changes: 4 additions & 3 deletions generated_api_shadow/envoy/service/status/v4alpha/csds.proto

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

0 comments on commit 5fb88f0

Please sign in to comment.