istio · PiotrSikora · Mar 11, 2019 · Feb 1, 2019 · Feb 1, 2019 · Feb 1, 2019
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -4,7 +4,7 @@ executors:
   ubuntu-build:
     description: "A regular build executor based on ubuntu image"
     docker:
-      - image: envoyproxy/envoy-build:111781fa2823535762e9c514db0c5c41a119b4b1
+      - image: envoyproxy/envoy-build:698009170e362f9ca0594f2b1927fbbee199bf98
     resource_class: xlarge
     working_directory: /source
 
@@ -22,7 +22,8 @@ jobs:
        - run: ci/docker_push.sh
        - run: ci/docker_tag.sh
        - store_artifacts:
-           path: /build/envoy/generated/failed-testlogs
+           path: /build/envoy/generated
+           destination: /
    asan:
      executor: ubuntu-build
      steps:
@@ -33,23 +34,27 @@ jobs:
        - checkout
        - run: ci/do_circle_ci.sh bazel.asan
        - store_artifacts:
-           path: /build/envoy/generated/failed-testlogs
+           path: /build/envoy/generated
+           destination: /
    tsan:
      executor: ubuntu-build
      steps:
        - run: rm -rf /home/circleci/project/.git # CircleCI git caching is likely broken
        - checkout
        - run: ci/do_circle_ci.sh bazel.tsan
        - store_artifacts:
-           path: /build/envoy/generated/failed-testlogs
+           path: /build/envoy/generated
+           destination: /
+
    compile_time_options:
      executor: ubuntu-build
      steps:
        - run: rm -rf /home/circleci/project/.git # CircleCI git caching is likely broken
        - checkout
        - run: ci/do_circle_ci.sh bazel.compile_time_options
        - store_artifacts:
-           path: /build/envoy/generated/failed-testlogs
+           path: /build/envoy/generated
+           destination: /
    api:
      executor: ubuntu-build
      steps:
@@ -61,7 +66,8 @@ jobs:
              - "fb:f3:fe:be:1c:b2:ec:b6:25:f9:7b:a6:87:54:02:8c"
        - run: ci/api_mirror.sh
        - store_artifacts:
-           path: /build/envoy/generated/failed-testlogs
+           path: /build/envoy/generated
+           destination: /
    filter_example_mirror:
      executor: ubuntu-build
      steps:
@@ -105,7 +111,8 @@ jobs:
            no_output_timeout: 60m
        - run: ci/coverage_publish.sh
        - store_artifacts:
-           path: /build/envoy/generated/coverage
+           path: /build/envoy/generated
+           destination: /
 
    clang_tidy:
      executor: ubuntu-build
@@ -127,6 +134,7 @@ jobs:
        - run: ci/do_circle_ci.sh check_format
        - run: ci/do_circle_ci.sh check_repositories
        - run: ci/do_circle_ci.sh check_spelling
+       - run: ci/do_circle_ci.sh check_spelling_pedantic
    build_image:
      docker:
        - image: circleci/python:3.7

diff --git a/api/envoy/admin/v2alpha/certs.proto b/api/envoy/admin/v2alpha/certs.proto
@@ -1,6 +1,9 @@
 syntax = "proto3";
 
 package 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";

diff --git a/api/envoy/admin/v2alpha/clusters.proto b/api/envoy/admin/v2alpha/clusters.proto
@@ -1,6 +1,9 @@
 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";

diff --git a/api/envoy/admin/v2alpha/config_dump.proto b/api/envoy/admin/v2alpha/config_dump.proto
@@ -1,6 +1,9 @@
 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/cds.proto";

diff --git a/api/envoy/admin/v2alpha/memory.proto b/api/envoy/admin/v2alpha/memory.proto
@@ -1,6 +1,9 @@
 syntax = "proto3";
 
 package envoy.admin.v2alpha;
+
+option java_outer_classname = "MemoryProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.admin.v2alpha";
 
 // [#protodoc-title: Memory]

diff --git a/api/envoy/admin/v2alpha/metrics.proto b/api/envoy/admin/v2alpha/metrics.proto
@@ -1,6 +1,9 @@
 syntax = "proto3";
 
 package envoy.admin.v2alpha;
+
+option java_outer_classname = "MetricsProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.admin.v2alpha";
 
 // [#protodoc-title: Metrics]

diff --git a/api/envoy/admin/v2alpha/mutex_stats.proto b/api/envoy/admin/v2alpha/mutex_stats.proto
@@ -1,6 +1,9 @@
 syntax = "proto3";
 
 package envoy.admin.v2alpha;
+
+option java_outer_classname = "MutexStatsProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.admin.v2alpha";
 
 // [#protodoc-title: MutexStats]

diff --git a/api/envoy/admin/v2alpha/server_info.proto b/api/envoy/admin/v2alpha/server_info.proto
@@ -1,6 +1,9 @@
 syntax = "proto3";
 
 package 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";

diff --git a/api/envoy/admin/v2alpha/tap.proto b/api/envoy/admin/v2alpha/tap.proto
@@ -4,6 +4,9 @@ import "envoy/service/tap/v2alpha/common.proto";
 import "validate/validate.proto";
 
 package envoy.admin.v2alpha;
+
+option java_outer_classname = "TapProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.admin.v2alpha";
 
 // The /tap admin request body that is used to configure an active tap session.

diff --git a/api/envoy/api/v2/auth/cert.proto b/api/envoy/api/v2/auth/cert.proto
@@ -1,6 +1,9 @@
 syntax = "proto3";
 
 package envoy.api.v2.auth;
+
+option java_outer_classname = "CertProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.api.v2.auth";
 option go_package = "auth";
 

diff --git a/api/envoy/api/v2/cds.proto b/api/envoy/api/v2/cds.proto
@@ -1,6 +1,9 @@
 syntax = "proto3";
 
 package envoy.api.v2;
+
+option java_outer_classname = "CdsProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.api.v2";
 
 option java_generic_services = true;

diff --git a/api/envoy/api/v2/cluster/circuit_breaker.proto b/api/envoy/api/v2/cluster/circuit_breaker.proto
@@ -1,6 +1,9 @@
 syntax = "proto3";
 
 package envoy.api.v2.cluster;
+
+option java_outer_classname = "CircuitBreakerProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.api.v2.cluster";
 option go_package = "cluster";
 option csharp_namespace = "Envoy.Api.V2.ClusterNS";

diff --git a/api/envoy/api/v2/cluster/outlier_detection.proto b/api/envoy/api/v2/cluster/outlier_detection.proto
@@ -1,6 +1,9 @@
 syntax = "proto3";
 
 package envoy.api.v2.cluster;
+
+option java_outer_classname = "OutlierDetectionProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.api.v2.cluster";
 option csharp_namespace = "Envoy.Api.V2.ClusterNS";
 

diff --git a/api/envoy/api/v2/core/address.proto b/api/envoy/api/v2/core/address.proto
@@ -1,6 +1,9 @@
 syntax = "proto3";
 
 package envoy.api.v2.core;
+
+option java_outer_classname = "AddressProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.api.v2.core";
 
 import "envoy/api/v2/core/base.proto";

diff --git a/api/envoy/api/v2/core/base.proto b/api/envoy/api/v2/core/base.proto
@@ -1,6 +1,9 @@
 syntax = "proto3";
 
 package envoy.api.v2.core;
+
+option java_outer_classname = "BaseProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.api.v2.core";
 option go_package = "core";
 
@@ -237,3 +240,11 @@ message RuntimeFractionalPercent {
   // Runtime key for a YAML representation of a FractionalPercent.
   string runtime_key = 2;
 }
+
+// Identifies a specific ControlPlane instance that Envoy is connected to.
+message ControlPlane {
+  // An opaque control plane identifier that uniquely identifies an instance
+  // of control plane. This can be used to identify which control plane instance,
+  // the Envoy is connected to.
+  string identifier = 1;
+}
diff --git a/api/envoy/api/v2/core/config_source.proto b/api/envoy/api/v2/core/config_source.proto
@@ -1,6 +1,9 @@
 syntax = "proto3";
 
 package envoy.api.v2.core;
+
+option java_outer_classname = "ConfigSourceProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.api.v2.core";
 
 import "envoy/api/v2/core/grpc_service.proto";

diff --git a/api/envoy/api/v2/core/grpc_service.proto b/api/envoy/api/v2/core/grpc_service.proto
@@ -1,6 +1,9 @@
 syntax = "proto3";
 
 package envoy.api.v2.core;
+
+option java_outer_classname = "GrpcServiceProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.api.v2.core";
 
 import "envoy/api/v2/core/base.proto";

diff --git a/api/envoy/api/v2/core/health_check.proto b/api/envoy/api/v2/core/health_check.proto
@@ -1,6 +1,9 @@
 syntax = "proto3";
 
 package envoy.api.v2.core;
+
+option java_outer_classname = "HealthCheckProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.api.v2.core";
 
 import "envoy/api/v2/core/base.proto";
@@ -251,4 +254,7 @@ enum HealthStatus {
   // Health check timed out. This is part of HDS and is interpreted by Envoy as
   // *UNHEALTHY*.
   TIMEOUT = 4;
+
+  // Degraded.
+  DEGRADED = 5;
 }
diff --git a/api/envoy/api/v2/core/http_uri.proto b/api/envoy/api/v2/core/http_uri.proto
@@ -1,6 +1,9 @@
 syntax = "proto3";
 
 package envoy.api.v2.core;
+
+option java_outer_classname = "HttpUriProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.api.v2.core";
 
 import "google/protobuf/duration.proto";

diff --git a/api/envoy/api/v2/core/protocol.proto b/api/envoy/api/v2/core/protocol.proto
@@ -3,6 +3,9 @@
 syntax = "proto3";
 
 package envoy.api.v2.core;
+
+option java_outer_classname = "ProtocolProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.api.v2.core";
 
 import "google/protobuf/duration.proto";

diff --git a/api/envoy/api/v2/discovery.proto b/api/envoy/api/v2/discovery.proto
@@ -1,6 +1,9 @@
 syntax = "proto3";
 
 package envoy.api.v2;
+
+option java_outer_classname = "DiscoveryProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.api.v2";
 option go_package = "v2";
 
@@ -93,6 +96,10 @@ message DiscoveryResponse {
   // DiscoveryRequest bearing the nonce. The nonce is optional and is not
   // required for non-stream based xDS implementations.
   string nonce = 5;
+
+  // [#not-implemented-hide:]
+  // The control plane instance that sent the response.
+  core.ControlPlane control_plane = 6;
 }
 
 // IncrementalDiscoveryRequest and IncrementalDiscoveryResponse are used in a

diff --git a/api/envoy/api/v2/eds.proto b/api/envoy/api/v2/eds.proto
@@ -1,6 +1,9 @@
 syntax = "proto3";
 
 package envoy.api.v2;
+
+option java_outer_classname = "EdsProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.api.v2";
 
 option java_generic_services = true;

diff --git a/api/envoy/api/v2/endpoint/endpoint.proto b/api/envoy/api/v2/endpoint/endpoint.proto
@@ -1,6 +1,9 @@
 syntax = "proto3";
 
 package envoy.api.v2.endpoint;
+
+option java_outer_classname = "EndpointProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.api.v2.endpoint";
 option go_package = "endpoint";
 
@@ -108,8 +111,8 @@ message LocalityLbEndpoints {
   // Locality weights are only considered when :ref:`locality weighted load
   // balancing <arch_overview_load_balancing_locality_weighted_lb>` is
   // configured. These weights are ignored otherwise. If no weights are
-  // specified when locality weighted load balancing is enabled, the cluster is
-  // assumed to have a weight of 1.
+  // specified when locality weighted load balancing is enabled, the locality is
+  // assigned no load.
   //
   // .. attention::
   //

diff --git a/api/envoy/api/v2/endpoint/load_report.proto b/api/envoy/api/v2/endpoint/load_report.proto
@@ -1,6 +1,9 @@
 syntax = "proto3";
 
 package envoy.api.v2.endpoint;
+
+option java_outer_classname = "LoadReportProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.api.v2.endpoint";
 
 import "envoy/api/v2/core/address.proto";

diff --git a/api/envoy/api/v2/lds.proto b/api/envoy/api/v2/lds.proto
@@ -1,6 +1,9 @@
 syntax = "proto3";
 
 package envoy.api.v2;
+
+option java_outer_classname = "LdsProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.api.v2";
 
 option java_generic_services = true;

diff --git a/api/envoy/api/v2/listener/listener.proto b/api/envoy/api/v2/listener/listener.proto
@@ -1,6 +1,9 @@
 syntax = "proto3";
 
 package envoy.api.v2.listener;
+
+option java_outer_classname = "ListenerProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.api.v2.listener";
 option go_package = "listener";
 option csharp_namespace = "Envoy.Api.V2.ListenerNS";

diff --git a/api/envoy/api/v2/ratelimit/ratelimit.proto b/api/envoy/api/v2/ratelimit/ratelimit.proto
@@ -1,6 +1,9 @@
 syntax = "proto3";
 
 package envoy.api.v2.ratelimit;
+
+option java_outer_classname = "RatelimitProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.api.v2.ratelimit";
 option go_package = "ratelimit";
 

diff --git a/api/envoy/api/v2/rds.proto b/api/envoy/api/v2/rds.proto
@@ -1,6 +1,9 @@
 syntax = "proto3";
 
 package envoy.api.v2;
+
+option java_outer_classname = "RdsProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.api.v2";
 
 option java_generic_services = true;

diff --git a/api/envoy/api/v2/route/route.proto b/api/envoy/api/v2/route/route.proto
@@ -1,6 +1,9 @@
 syntax = "proto3";
 
 package envoy.api.v2.route;
+
+option java_outer_classname = "RouteProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.api.v2.route";
 option go_package = "route";
 option java_generic_services = true;