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.

Sign up for GitHub

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

Upgrade to Envoy 1.13.0 #2318

Merged
merged 2 commits into from
Apr 28, 2020
Merged

Upgrade to Envoy 1.13.0 #2318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c4e6be2
Upgrade Envoy from 1.12.2 to 1.13.0 (but don't run `make generate`) […
LukeShu Feb 14, 2020
cd38fe5
Run: make generate
LukeShu Apr 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
6 changes: 3 additions & 3 deletions api/envoy/admin/v2alpha/certs.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ syntax = "proto3";

package envoy.admin.v2alpha;

import "google/protobuf/timestamp.proto";

option java_package = "io.envoyproxy.envoy.admin.v2alpha";
option java_outer_classname = "CertsProto";
option java_multiple_files = true;
option java_package = "io.envoyproxy.envoy.admin.v2alpha";

import "google/protobuf/timestamp.proto";

// [#protodoc-title: Certificates]

Expand Down
10 changes: 5 additions & 5 deletions api/envoy/admin/v2alpha/clusters.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@ syntax = "proto3";

package envoy.admin.v2alpha;

option java_outer_classname = "ClustersProto";
option java_multiple_files = true;
option java_package = "io.envoyproxy.envoy.admin.v2alpha";

import "envoy/admin/v2alpha/metrics.proto";
import "envoy/api/v2/core/address.proto";
import "envoy/api/v2/core/health_check.proto";
import "envoy/type/percent.proto";

option java_package = "io.envoyproxy.envoy.admin.v2alpha";
option java_outer_classname = "ClustersProto";
option java_multiple_files = true;

// [#protodoc-title: Clusters]

// Admin endpoint uses this wrapper for `/clusters` to display cluster status information.
Expand Down Expand Up @@ -141,6 +141,6 @@ message HostHealthStatus {

// Health status as reported by EDS. Note: only HEALTHY and UNHEALTHY are currently supported
// here.
// TODO(mrice32): pipe through remaining EDS health status possibilities.
// [#comment:TODO(mrice32): pipe through remaining EDS health status possibilities.]
api.v2.core.HealthStatus eds_health_status = 3;
}
101 changes: 62 additions & 39 deletions api/envoy/admin/v2alpha/config_dump.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,15 @@ syntax = "proto3";

package envoy.admin.v2alpha;

option java_outer_classname = "ConfigDumpProto";
option java_multiple_files = true;
option java_package = "io.envoyproxy.envoy.admin.v2alpha";

import "envoy/api/v2/auth/cert.proto";
import "envoy/api/v2/cds.proto";
import "envoy/api/v2/lds.proto";
import "envoy/api/v2/rds.proto";
import "envoy/api/v2/srds.proto";
import "envoy/config/bootstrap/v2/bootstrap.proto";

import "google/protobuf/any.proto";
import "google/protobuf/timestamp.proto";

option java_package = "io.envoyproxy.envoy.admin.v2alpha";
option java_outer_classname = "ConfigDumpProto";
option java_multiple_files = true;

// [#protodoc-title: ConfigDump]

// The :ref:`/config_dump <operations_admin_interface_config_dump>` admin endpoint uses this wrapper
Expand All @@ -31,9 +26,26 @@ message ConfigDump {
// * *clusters*: :ref:`ClustersConfigDump <envoy_api_msg_admin.v2alpha.ClustersConfigDump>`
// * *listeners*: :ref:`ListenersConfigDump <envoy_api_msg_admin.v2alpha.ListenersConfigDump>`
// * *routes*: :ref:`RoutesConfigDump <envoy_api_msg_admin.v2alpha.RoutesConfigDump>`
//
// You can filter output with the resource and mask query parameters.
// See :ref:`/config_dump?resource={} <operations_admin_interface_config_dump_by_resource>`,
// :ref:`/config_dump?mask={} <operations_admin_interface_config_dump_by_mask>`,
// or :ref:`/config_dump?resource={},mask={}
// <operations_admin_interface_config_dump_by_resource_and_mask>` for more information.
repeated google.protobuf.Any configs = 1;
}

message UpdateFailureState {
// What the component configuration would have been if the update had succeeded.
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 message describes the bootstrap configuration that Envoy was started with. This includes
// any CLI overrides that were merged. Bootstrap configuration information can be used to recreate
// the static portions of an Envoy configuration by reusing the output as the bootstrap
Expand All @@ -48,32 +60,56 @@ message BootstrapConfigDump {
// Envoy's listener manager fills this message with all currently known listeners. Listener
// configuration information can be used to recreate an Envoy configuration by populating all
// listeners as static listeners or by returning them in a LDS response.
// [#next-free-field: 6]
message ListenersConfigDump {
// Describes a statically loaded listener.
message StaticListener {
// The listener config.
api.v2.Listener listener = 1;
google.protobuf.Any listener = 1;

// The timestamp when the Listener was last updated.
// The timestamp when the Listener was last successfully updated.
google.protobuf.Timestamp last_updated = 2;
}

// Describes a dynamically loaded cluster via the LDS API.
message DynamicListener {
message DynamicListenerState {
// This is the per-resource version information. This version is currently taken from the
// :ref:`version_info <envoy_api_field_DiscoveryResponse.version_info>` field at the time
// that the listener was loaded. In the future, discrete per-listener versions may be supported
// by the API.
string version_info = 1;

// The listener config.
api.v2.Listener listener = 2;
google.protobuf.Any listener = 2;

// The timestamp when the Listener was last updated.
// The timestamp when the Listener was last successfully updated.
google.protobuf.Timestamp last_updated = 3;
}

// Describes a dynamically loaded listener via the LDS API.
// [#next-free-field: 6]
message DynamicListener {
// The name or unique id of this listener, pulled from the DynamicListenerState config.
string name = 1;

// The listener state for any active listener by this name.
// These are listeners that are available to service data plane traffic.
DynamicListenerState active_state = 2;

// The listener state for any warming listener by this name.
// These are listeners that are currently undergoing warming in preparation to service data
// plane traffic. Note that if attempting to recreate an Envoy configuration from a
// configuration dump, the warming listeners should generally be discarded.
DynamicListenerState warming_state = 3;

// The listener state for any draining listener by this name.
// These are listeners that are currently undergoing draining in preparation to stop servicing
// data plane traffic. Note that if attempting to recreate an Envoy configuration from a
// configuration dump, the draining listeners should generally be discarded.
DynamicListenerState draining_state = 4;

// Set if the last update failed, cleared after the next successful update.
UpdateFailureState error_state = 5;
}

// This is the :ref:`version_info <envoy_api_field_DiscoveryResponse.version_info>` in the
// last processed LDS discovery response. If there are only static bootstrap listeners, this field
// will be "".
Expand All @@ -82,21 +118,8 @@ message ListenersConfigDump {
// The statically loaded listener configs.
repeated StaticListener static_listeners = 2;

// The dynamically loaded active listeners. These are listeners that are available to service
// data plane traffic.
repeated DynamicListener dynamic_active_listeners = 3;

// The dynamically loaded warming listeners. These are listeners that are currently undergoing
// warming in preparation to service data plane traffic. Note that if attempting to recreate an
// Envoy configuration from a configuration dump, the warming listeners should generally be
// discarded.
repeated DynamicListener dynamic_warming_listeners = 4;

// The dynamically loaded draining listeners. These are listeners that are currently undergoing
// draining in preparation to stop servicing data plane traffic. Note that if attempting to
// recreate an Envoy configuration from a configuration dump, the draining listeners should
// generally be discarded.
repeated DynamicListener dynamic_draining_listeners = 5;
// State for any warming, active, or draining listeners.
repeated DynamicListener dynamic_listeners = 3;
}

// Envoy's cluster manager fills this message with all currently known clusters. Cluster
Expand All @@ -106,7 +129,7 @@ message ClustersConfigDump {
// Describes a statically loaded cluster.
message StaticCluster {
// The cluster config.
api.v2.Cluster cluster = 1;
google.protobuf.Any cluster = 1;

// The timestamp when the Cluster was last updated.
google.protobuf.Timestamp last_updated = 2;
Expand All @@ -121,7 +144,7 @@ message ClustersConfigDump {
string version_info = 1;

// The cluster config.
api.v2.Cluster cluster = 2;
google.protobuf.Any cluster = 2;

// The timestamp when the Cluster was last updated.
google.protobuf.Timestamp last_updated = 3;
Expand Down Expand Up @@ -154,7 +177,7 @@ message ClustersConfigDump {
message RoutesConfigDump {
message StaticRouteConfig {
// The route config.
api.v2.RouteConfiguration route_config = 1;
google.protobuf.Any route_config = 1;

// The timestamp when the Route was last updated.
google.protobuf.Timestamp last_updated = 2;
Expand All @@ -167,7 +190,7 @@ message RoutesConfigDump {
string version_info = 1;

// The route config.
api.v2.RouteConfiguration route_config = 2;
google.protobuf.Any route_config = 2;

// The timestamp when the Route was last updated.
google.protobuf.Timestamp last_updated = 3;
Expand All @@ -190,7 +213,7 @@ message ScopedRoutesConfigDump {
string name = 1;

// The scoped route configurations.
repeated api.v2.ScopedRouteConfiguration scoped_route_configs = 2;
repeated google.protobuf.Any scoped_route_configs = 2;

// The timestamp when the scoped route config set was last updated.
google.protobuf.Timestamp last_updated = 3;
Expand All @@ -206,7 +229,7 @@ message ScopedRoutesConfigDump {
string version_info = 2;

// The scoped route configurations.
repeated api.v2.ScopedRouteConfiguration scoped_route_configs = 3;
repeated google.protobuf.Any scoped_route_configs = 3;

// The timestamp when the scoped route config set was last updated.
google.protobuf.Timestamp last_updated = 4;
Expand Down Expand Up @@ -235,7 +258,7 @@ message SecretsConfigDump {
// The actual secret information.
// Security sensitive information is redacted (replaced with "[redacted]") for
// private keys and passwords in TLS certificates.
api.v2.auth.Secret secret = 4;
google.protobuf.Any secret = 4;
}

// StaticSecret specifies statically loaded secret in bootstrap.
Expand All @@ -249,7 +272,7 @@ message SecretsConfigDump {
// The actual secret information.
// Security sensitive information is redacted (replaced with "[redacted]") for
// private keys and passwords in TLS certificates.
api.v2.auth.Secret secret = 3;
google.protobuf.Any secret = 3;
}

// The statically loaded secrets.
Expand Down
6 changes: 3 additions & 3 deletions api/envoy/admin/v2alpha/listeners.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ syntax = "proto3";

package envoy.admin.v2alpha;

import "envoy/api/v2/core/address.proto";

option java_package = "io.envoyproxy.envoy.admin.v2alpha";
option java_outer_classname = "ListenersProto";
option java_multiple_files = true;
option java_package = "io.envoyproxy.envoy.admin.v2alpha";

import "envoy/api/v2/core/address.proto";

// [#protodoc-title: Listeners]

Expand Down
2 changes: 1 addition & 1 deletion api/envoy/admin/v2alpha/memory.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ syntax = "proto3";

package envoy.admin.v2alpha;

option java_package = "io.envoyproxy.envoy.admin.v2alpha";
option java_outer_classname = "MemoryProto";
option java_multiple_files = true;
option java_package = "io.envoyproxy.envoy.admin.v2alpha";

// [#protodoc-title: Memory]

Expand Down
2 changes: 1 addition & 1 deletion api/envoy/admin/v2alpha/metrics.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ syntax = "proto3";

package envoy.admin.v2alpha;

option java_package = "io.envoyproxy.envoy.admin.v2alpha";
option java_outer_classname = "MetricsProto";
option java_multiple_files = true;
option java_package = "io.envoyproxy.envoy.admin.v2alpha";

// [#protodoc-title: Metrics]

Expand Down
2 changes: 1 addition & 1 deletion api/envoy/admin/v2alpha/mutex_stats.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ syntax = "proto3";

package envoy.admin.v2alpha;

option java_package = "io.envoyproxy.envoy.admin.v2alpha";
option java_outer_classname = "MutexStatsProto";
option java_multiple_files = true;
option java_package = "io.envoyproxy.envoy.admin.v2alpha";

// [#protodoc-title: MutexStats]

Expand Down
21 changes: 15 additions & 6 deletions api/envoy/admin/v2alpha/server_info.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,13 @@ syntax = "proto3";

package envoy.admin.v2alpha;

import "google/protobuf/duration.proto";

import "envoy/annotations/deprecation.proto";

option java_package = "io.envoyproxy.envoy.admin.v2alpha";
option java_outer_classname = "ServerInfoProto";
option java_multiple_files = true;
option java_package = "io.envoyproxy.envoy.admin.v2alpha";

import "google/protobuf/duration.proto";

// [#protodoc-title: Server State]

Expand Down Expand Up @@ -47,7 +49,7 @@ message ServerInfo {
CommandLineOptions command_line_options = 6;
}

// [#next-free-field: 27]
// [#next-free-field: 29]
message CommandLineOptions {
enum IpVersion {
v4 = 0;
Expand Down Expand Up @@ -100,6 +102,9 @@ message CommandLineOptions {
// See :option:`--log-format` for details.
string log_format = 10;

// See :option:`--log-format-escaped` for details.
bool log_format_escaped = 27;

// See :option:`--log-path` for details.
string log_path = 11;

Expand All @@ -125,9 +130,10 @@ message CommandLineOptions {
Mode mode = 19;

// max_stats and max_obj_name_len are now unused and have no effect.
uint64 max_stats = 20 [deprecated = true];
uint64 max_stats = 20 [deprecated = true, (envoy.annotations.disallowed_by_default) = true];

uint64 max_obj_name_len = 21 [deprecated = true];
uint64 max_obj_name_len = 21
[deprecated = true, (envoy.annotations.disallowed_by_default) = true];

// See :option:`--disable-hot-restart` for details.
bool disable_hot_restart = 22;
Expand All @@ -140,4 +146,7 @@ message CommandLineOptions {

// See :option:`--cpuset-threads` for details.
bool cpuset_threads = 25;

// See :option:`--disable-extensions` for details.
repeated string disabled_extensions = 28;
}
10 changes: 6 additions & 4 deletions api/envoy/admin/v2alpha/tap.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,16 @@ syntax = "proto3";

package envoy.admin.v2alpha;

option java_outer_classname = "TapProto";
option java_multiple_files = true;
option java_package = "io.envoyproxy.envoy.admin.v2alpha";

import "envoy/service/tap/v2alpha/common.proto";

import "validate/validate.proto";

option java_package = "io.envoyproxy.envoy.admin.v2alpha";
option java_outer_classname = "TapProto";
option java_multiple_files = true;

// [#protodoc-title: Tap]

// The /tap admin request body that is used to configure an active tap session.
message TapRequest {
// The opaque configuration ID used to match the configuration to a loaded extension.
Expand Down
Loading