allow specifying the API version of bootstrap from the command line (#10803)

Adds a --boostrap_version flag that can be used to determine which API version the bootstrap should be parsed as.

Risk Level: Low
Testing: UTs
Docs Changes: Flag docs
Release Notes: n/a
Fixes #10343

Signed-off-by: Snow Pettersen <aickck@gmail.com>

Co-authored-by: Snow Pettersen <kpettersen@netflix.com>

Mirrored from https://github.com/envoyproxy/envoy @ 62777e87edc9f16af5c7920bb86f198585789a3d
master-ci-test
data-plane-api(CircleCI) 5 years ago
parent 85973b6e37
commit 0bef2eecae
  1. 5
      envoy/admin/v3/server_info.proto
  2. 5
      envoy/admin/v4alpha/server_info.proto

@ -54,7 +54,7 @@ message ServerInfo {
CommandLineOptions command_line_options = 6; CommandLineOptions command_line_options = 6;
} }
// [#next-free-field: 29] // [#next-free-field: 30]
message CommandLineOptions { message CommandLineOptions {
option (udpa.annotations.versioning).previous_message_type = option (udpa.annotations.versioning).previous_message_type =
"envoy.admin.v2alpha.CommandLineOptions"; "envoy.admin.v2alpha.CommandLineOptions";
@ -153,4 +153,7 @@ message CommandLineOptions {
// See :option:`--disable-extensions` for details. // See :option:`--disable-extensions` for details.
repeated string disabled_extensions = 28; repeated string disabled_extensions = 28;
// See :option:`--bootstrap-version` for details.
uint32 bootstrap_version = 29;
} }

@ -54,7 +54,7 @@ message ServerInfo {
CommandLineOptions command_line_options = 6; CommandLineOptions command_line_options = 6;
} }
// [#next-free-field: 29] // [#next-free-field: 30]
message CommandLineOptions { message CommandLineOptions {
option (udpa.annotations.versioning).previous_message_type = "envoy.admin.v3.CommandLineOptions"; option (udpa.annotations.versioning).previous_message_type = "envoy.admin.v3.CommandLineOptions";
@ -152,4 +152,7 @@ message CommandLineOptions {
// See :option:`--disable-extensions` for details. // See :option:`--disable-extensions` for details.
repeated string disabled_extensions = 28; repeated string disabled_extensions = 28;
// See :option:`--bootstrap-version` for details.
uint32 bootstrap_version = 29;
} }

Loading…
Cancel
Save