larrywest · larrywest · Apr 23, 2019 · Mar 22, 2019 · Mar 22, 2019 · Mar 22, 2019
diff --git a/.bazelignore b/.bazelignore
@@ -0,0 +1,2 @@
+api
+examples/grpc-bridge/script
diff --git a/.bazelrc b/.bazelrc
@@ -22,6 +22,7 @@ build:asan --define signal_trace=disabled
 build:asan --copt -DADDRESS_SANITIZER=1
 build:asan --copt -D__SANITIZE_ADDRESS__
 build:asan --test_env=ASAN_OPTIONS=handle_abort=1:allow_addr2line=true:check_initialization_order=true:strict_init_order=true
+build:asan --test_env=UBSAN_OPTIONS=halt_on_error=true:print_stacktrace=1
 build:asan --test_env=ASAN_SYMBOLIZER_PATH
 
 # Clang ASAN/UBSAN

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:698009170e362f9ca0594f2b1927fbbee199bf98
+      - image: envoyproxy/envoy-build:cfc514546bc0284536893cca5fa43d7128edcd35
     resource_class: xlarge
     working_directory: /source
 

diff --git a/.clang-tidy b/.clang-tidy
@@ -1,7 +1,7 @@
-Checks:          'clang-diagnostic-*,clang-analyzer-*,abseil-*,bugprone-*,modernize-*,performance-*,readability-redundant-*,readability-braces-around-statements'
+Checks:          'clang-diagnostic-*,clang-analyzer-*,abseil-*,bugprone-*,modernize-*,performance-*,readability-redundant-*,readability-braces-around-statements,readability-container-size-empty'
 
 #TODO(lizan): grow this list, fix possible warnings and make more checks as error
-WarningsAsErrors: 'bugprone-assert-side-effect,modernize-make-shared,modernize-make-unique,readability-redundant-smartptr-get,readability-braces-around-statements,readability-redundant-string-cstr,bugprone-use-after-move'
+WarningsAsErrors: 'bugprone-assert-side-effect,modernize-make-shared,modernize-make-unique,readability-redundant-smartptr-get,readability-braces-around-statements,readability-redundant-string-cstr,bugprone-use-after-move,readability-container-size-empty'
 
 CheckOptions:
   - key:             bugprone-assert-side-effect.AssertMacros

diff --git a/CODEOWNERS b/CODEOWNERS
@@ -22,3 +22,5 @@
 /*/extensions/filters/network/mysql_proxy @rshriram @venilnoronha @mattklein123
 # quic extension
 /*/extensions/quic_listeners/ @alyssawilk @danzh2010 @mattklein123 @mpwarres @wu-bin
+# zookeeper_proxy extension
+/*/extensions/filters/network/zookeeper_proxy @rgs1 @snowp
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -51,7 +51,7 @@ maximize the chances of your PR being merged.
   deprecation window. Within this window, a warning of deprecation should be carefully logged (some
   features might need rate limiting for logging this). We make no guarantees about code or deployments
   that rely on undocumented behavior.
-* All deprecations/breaking changes will be clearly listed in [DEPRECATED.md](DEPRECATED.md).
+* All deprecations/breaking changes will be clearly listed in the [deprecated log](docs/root/intro/deprecated.rst).
 * High risk deprecations//breaking changes may be announced to the
   [envoy-announce](https://groups.google.com/forum/#!forum/envoy-announce) email list but by default
   it is expected the multi-phase warn-by-default/fail-by-default is sufficient to warn users to move
@@ -132,7 +132,8 @@ maximize the chances of your PR being merged.
   changes for 7 days. Obviously PRs that are closed due to lack of activity can be reopened later.
   Closing stale PRs helps us to keep on top of all of the work currently in flight.
 * If a commit deprecates a feature, the commit message must mention what has been deprecated.
-  Additionally, [DEPRECATED.md](DEPRECATED.md) must be updated as part of the commit.
+  Additionally, the [deprecated log](docs/root/intro/deprecated.rst) must be updated with relevant
+  RST links for fields and messages as part of the commit.
 * Please consider joining the [envoy-dev](https://groups.google.com/forum/#!forum/envoy-dev)
   mailing list.
 * If your PR involves any changes to
@@ -312,9 +313,17 @@ should only be done to correct a DCO mistake.
 
 ## Triggering CI re-run without making changes
 
-Sometimes CI test runs fail due to obvious resource problems or other issues
-which are not related to your PR. It may be desirable to re-trigger CI without
-making any code changes. Consider adding an alias into your `.gitconfig` file:
+To rerun failed tasks in CI, add a comment with the the line
+
+```
+/retest
+```
+
+in it. This should rebuild only the failed tasks.
+
+Sometimes tasks will be stuck in CI and won't be marked as failed, which means
+the above command won't work. Should this happen, pushing an empty commit should
+re-run all the CI tasks. Consider adding an alias into your `.gitconfig` file:
 
 ```
 [alias]

diff --git a/DEPRECATED.md b/DEPRECATED.md
@@ -1,112 +1,3 @@
 # DEPRECATED
 
-As of release 1.3.0, Envoy will follow a
-[Breaking Change Policy](https://github.com/envoyproxy/envoy/blob/master//CONTRIBUTING.md#breaking-change-policy).
-
-The following features have been DEPRECATED and will be removed in the specified release cycle.
-A logged warning is expected for each deprecated item that is in deprecation window.
-
-## Version 1.10.0 (pending)
-* Use of `use_alpha` in [Ext-Authz Authorization Service](https://github.com/envoyproxy/envoy/blob/master/api/envoy/service/auth/v2/external_auth.proto) is deprecated. It should be used for a short time, and only when transitioning from alpha to V2 release version.
-* Use of `enabled` in `CorsPolicy`, found in
-  [route.proto](https://github.com/envoyproxy/envoy/blob/master/api/envoy/api/v2/route/route.proto).
-  Set the `filter_enabled` field instead.
-
-## Version 1.9.0 (Dec 20, 2018)
-
-* Order of execution of the network write filter chain has been reversed. Prior to this release cycle it was incorrect, see [#4599](https://github.com/envoyproxy/envoy/issues/4599). In the 1.9.0 release cycle we introduced `bugfix_reverse_write_filter_order` in [lds.proto](https://github.com/envoyproxy/envoy/blob/master/api/envoy/api/v2/lds.proto) to temporarily support both old and new behaviors. Note this boolean field is deprecated.
-* Order of execution of the HTTP encoder filter chain has been reversed. Prior to this release cycle it was incorrect, see [#4599](https://github.com/envoyproxy/envoy/issues/4599). In the 1.9.0 release cycle we introduced `bugfix_reverse_encode_order` in [http_connection_manager.proto](https://github.com/envoyproxy/envoy/blob/master/api/envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.proto) to temporarily support both old and new behaviors. Note this boolean field is deprecated.
-* Use of the v1 REST_LEGACY ApiConfigSource is deprecated.
-* Use of std::hash in the ring hash load balancer is deprecated.
-* Use of `rate_limit_service` configuration in the [bootstrap configuration](https://github.com/envoyproxy/envoy/blob/master/api/envoy/config/bootstrap/v2/bootstrap.proto) is deprecated.
-* Use of `runtime_key` in `RequestMirrorPolicy`, found in
-  [route.proto](https://github.com/envoyproxy/envoy/blob/master/api/envoy/api/v2/route/route.proto)
-  is deprecated. Set the `runtime_fraction` field instead.
-* Use of buffer filter `max_request_time` is deprecated in favor of the request timeout found in [HttpConnectionManager](https://github.com/envoyproxy/envoy/blob/master/api/envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.proto)
-
-## Version 1.8.0 (Oct 4, 2018)
-
-* Use of the v1 API (including `*.deprecated_v1` fields in the v2 API) is deprecated.
-  See envoy-announce [email](https://groups.google.com/forum/#!topic/envoy-announce/oPnYMZw8H4U).
-* Use of the legacy
-  [ratelimit.proto](https://github.com/envoyproxy/envoy/blob/b0a518d064c8255e0e20557a8f909b6ff457558f/source/common/ratelimit/ratelimit.proto)
-  is deprecated, in favor of the proto defined in
-  [date-plane-api](https://github.com/envoyproxy/envoy/blob/master/api/envoy/service/ratelimit/v2/rls.proto)
-  Prior to 1.8.0, Envoy can use either proto to send client requests to a ratelimit server with the use of the
-  `use_data_plane_proto` boolean flag in the [ratelimit configuration](https://github.com/envoyproxy/envoy/blob/master/api/envoy/config/ratelimit/v2/rls.proto).
-  However, when using the deprecated client a warning is logged.
-* Use of the --v2-config-only flag.
-* Use of both `use_websocket` and `websocket_config` in
-  [route.proto](https://github.com/envoyproxy/envoy/blob/master/api/envoy/api/v2/route/route.proto)
-  is deprecated. Please use the new `upgrade_configs` in the
-  [HttpConnectionManager](https://github.com/envoyproxy/envoy/blob/master/api/envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.proto)
-  instead.
-* Use of the integer `percent` field in [FaultDelay](https://github.com/envoyproxy/envoy/blob/master/api/envoy/config/filter/fault/v2/fault.proto)
-  and in [FaultAbort](https://github.com/envoyproxy/envoy/blob/master/api/envoy/config/filter/http/fault/v2/fault.proto) is deprecated in favor
-  of the new `FractionalPercent` based `percentage` field.
-* Setting hosts via `hosts` field in `Cluster` is deprecated. Use `load_assignment` instead.
-* Use of `response_headers_to_*` and `request_headers_to_add` are deprecated at the `RouteAction`
-  level. Please use the configuration options at the `Route` level.
-* Use of `runtime` in `RouteMatch`, found in
-  [route.proto](https://github.com/envoyproxy/envoy/blob/master/api/envoy/api/v2/route/route.proto).
-  Set the `runtime_fraction` field instead.
-* Use of the string `user` field in `Authenticated` in [rbac.proto](https://github.com/envoyproxy/envoy/blob/master/api/envoy/config/rbac/v2alpha/rbac.proto)
-  is deprecated in favor of the new `StringMatcher` based `principal_name` field.
-
-## Version 1.7.0 (Jun 21, 2018)
-
-* Admin mutations should be sent as POSTs rather than GETs. HTTP GETs will result in an error
-  status code and will not have their intended effect. Prior to 1.7, GETs can be used for
-  admin mutations, but a warning is logged.
-* Rate limit service configuration via the `cluster_name` field is deprecated. Use `grpc_service`
-  instead.
-* gRPC service configuration via the `cluster_names` field in `ApiConfigSource` is deprecated. Use
-  `grpc_services` instead. Prior to 1.7, a warning is logged.
-* Redis health checker configuration via the `redis_health_check` field in `HealthCheck` is
-  deprecated. Use `custom_health_check` with name `envoy.health_checkers.redis` instead. Prior
-  to 1.7, `redis_health_check` can be used, but warning is logged.
-* `SAN` is replaced by `URI` in the `x-forwarded-client-cert` header.
-* The `endpoint` field in the http health check filter is deprecated in favor of the `headers`
-  field where one can specify HeaderMatch objects to match on.
-* The `sni_domains` field in the filter chain match was deprecated/renamed to `server_names`.
-
-## Version 1.6.0 (March 20, 2018)
-
-* DOWNSTREAM_ADDRESS log formatter is deprecated. Use DOWNSTREAM_REMOTE_ADDRESS_WITHOUT_PORT
-  instead.
-* CLIENT_IP header formatter is deprecated. Use DOWNSTREAM_REMOTE_ADDRESS_WITHOUT_PORT instead.
-* 'use_original_dst' field in the v2 LDS API is deprecated. Use listener filters and filter chain
-  matching instead.
-* `value` and `regex` fields in the `HeaderMatcher` message is deprecated. Use the `exact_match`
-  or `regex_match` oneof instead.
-
-## Version 1.5.0 (Dec 4, 2017)
-
-* The outlier detection `ejections_total` stats counter has been deprecated and not replaced. Monitor
-  the individual `ejections_detected_*` counters for the detectors of interest, or
-  `ejections_enforced_total` for the total number of ejections that actually occurred.
-* The outlier detection `ejections_consecutive_5xx` stats counter has been deprecated in favour of
-  `ejections_detected_consecutive_5xx` and `ejections_enforced_consecutive_5xx`.
-* The outlier detection `ejections_success_rate` stats counter has been deprecated in favour of
-  `ejections_detected_success_rate` and `ejections_enforced_success_rate`.
-
-## Version 1.4.0 (Aug 24, 2017)
-
-* Config option `statsd_local_udp_port` has been deprecated and has been replaced with
-  `statsd_udp_ip_address`.
-* `HttpFilterConfigFactory` filter API has been deprecated in favor of `NamedHttpFilterConfigFactory`.
-* Config option `http_codec_options` has been deprecated and has been replaced with `http2_settings`.
-* The following log macros have been deprecated: `log_trace`, `log_debug`, `conn_log`,
-  `conn_log_info`, `conn_log_debug`, `conn_log_trace`, `stream_log`, `stream_log_info`,
-  `stream_log_debug`, `stream_log_trace`. For replacements, please see
-  [logger.h](https://github.com/envoyproxy/envoy/blob/master/source/common/common/logger.h).
-* The connectionId() and ssl() callbacks of StreamFilterCallbacks have been deprecated and
-  replaced with a more general connection() callback, which, when not returning a nullptr, can be
-  used to get the connection id and SSL connection from the returned Connection object pointer.
-* The protobuf stub gRPC support via `Grpc::RpcChannelImpl` is now replaced with `Grpc::AsyncClientImpl`.
-  This no longer uses `protoc` generated stubs but instead utilizes C++ template generation of the
-  RPC stubs. `Grpc::AsyncClientImpl` supports streaming, in addition to the previous unary, RPCs.
-* The direction of network and HTTP filters in the configuration will be ignored from 1.4.0 and
-  later removed from the configuration in the v2 APIs. Filter direction is now implied at the C++ type
-  level. The `type()` methods on the `NamedNetworkFilterConfigFactory` and
-  `NamedHttpFilterConfigFactory` interfaces have been removed to reflect this.
+The [deprecated log](https://www.envoyproxy.io/docs/envoy/latest/intro/deprecated) can be found in the official Envoy developer documentation.
diff --git a/GOVERNANCE.md b/GOVERNANCE.md
@@ -84,7 +84,7 @@ or you can subscribe to the iCal feed [here](https://app.opsgenie.com/webcal/get
   corrections.
 * Switch the [VERSION](VERSION) from a "dev" variant to a final variant. E.g., "1.6.0-dev" to
   "1.6.0". Also remove the "Pending" tag from the top of the [release notes](docs/root/intro/version_history.rst)
-  and [DEPRECATED.md](DEPRECATED.md). Get a review and merge.
+  and [deprecated log](docs/root/intro/deprecated.rst). Get a review and merge.
 * **Wait for tests to pass on
   [master](https://circleci.com/gh/envoyproxy/envoy/tree/master).**
 * Create a [tagged release](https://github.com/envoyproxy/envoy/releases). The release should
@@ -99,7 +99,7 @@ or you can subscribe to the iCal feed [here](https://app.opsgenie.com/webcal/get
   Envoy account post).
 * Do a new PR to update [VERSION](VERSION) to the next development release. E.g., "1.7.0-dev". At
   the same time, also add a new empty "pending" section to the [release
-  notes](docs/root/intro/version_history.rst) and to [DEPRECATED.md](DEPRECATED.md) for the
+  notes](docs/root/intro/version_history.rst) and to [deprecated log](docs/root/intro/deprecated.rst) for the
   following version. E.g., "1.7.0 (pending)".
 * Run the deprecate_versions.py script (e.g. `sh tools/deprecate_version/deprecate_version.sh 1.8.0 1.10.0`)
   to file tracking issues for code which can be removed.

diff --git a/OWNERS.md b/OWNERS.md
@@ -17,15 +17,16 @@ routing PRs, questions, etc. to the right place.
 * Stephan Zuercher ([zuercher](https://github.com/zuercher)) (zuercher@gmail.com)
   * Load balancing, upstream clusters and cluster manager, logging, complex HTTP routing
     (metadata, etc.), and macOS build.
+* Lizan Zhou ([lizan](https://github.com/lizan)) (lizan@tetrate.io)
+  * gRPC, gRPC/JSON transcoding, and core networking (transport socket abstractions), Bazel, build
+    issues, and CI in general.
 
 # Maintainers
 
 * Jose Nino ([junr03](https://github.com/junr03)) (jnino@lyft.com)
   * Outlier detection, HTTP routing, xDS, configuration/operational questions.
 * Dan Noé ([dnoe](https://github.com/dnoe)) (dpn@google.com)
   * Base server (watchdog, workers, startup, stack trace handling, etc.).
-* Lizan Zhou ([lizan](https://github.com/lizan)) (lizan@tetrate.io)
-  * gRPC, gRPC/JSON transcoding, and core networking (transport socket abstractions).
 * Dhi Aurrahman ([dio](https://github.com/dio)) (dio@tetrate.io)
   * Lua, access logging, and general miscellany.
 * Joshua Marantz ([jmarantz](https://github.com/jmarantz)) (jmarantz@google.com)

diff --git a/PULL_REQUESTS.md b/PULL_REQUESTS.md
@@ -74,7 +74,7 @@ you may instead just tag the PR with the issue:
 ### <a name="deprecated"></a>Deprecated
 
 If this PR deprecates existing Envoy APIs or code, it should include
-an update to the [deprecated file](DEPRECATED.md) and a one line note in the PR
+an update to the [deprecated file](docs/root/intro/deprecated.rst) and a one line note in the PR
 description.
 
 If you mark existing APIs or code as deprecated, when the next release is cut, the

diff --git a/README.md b/README.md
@@ -9,6 +9,8 @@ involved and how Envoy plays a role, read the CNCF
 [announcement](https://www.cncf.io/blog/2017/09/13/cncf-hosts-envoy/).
 
 [![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/1266/badge)](https://bestpractices.coreinfrastructure.org/projects/1266)
+[![CircleCI](https://circleci.com/gh/envoyproxy/envoy/tree/master.svg?style=shield)](https://circleci.com/gh/envoyproxy/envoy/tree/master)
+[![Jenkins](https://img.shields.io/jenkins/s/https/powerci.osuosl.org/job/build-envoy-master/badge/icon/.svg?label=ppc64le%20build)](http://powerci.osuosl.org/job/build-envoy-master/)
 
 ## Documentation
 

diff --git a/SECURITY_RELEASE_PROCESS.md b/SECURITY_RELEASE_PROCESS.md
@@ -256,6 +256,11 @@ We are definitely willing to help!
 > 8. Have someone already on the list vouch for the person requesting membership
      on behalf of your distribution.
 
-CrashOverride will vouch for Acidburn joining the list on behalf of the "Seven"
-distribution.
+CrashOverride will vouch for the "Seven" distribution joining the distribution list.
+
+> 9. Nominate an e-mail alias or list for your organization to receive updates. This should not be
+     an individual user address, but instead a list that can be maintained by your organization as
+     individuals come and go. A good example is envoy-security@seven.com, a bad example is
+     acidburn@seven.com. You must accept the invite sent to this address or you will not receive any
+     e-mail updates.
 ```
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.10.0-dev
+1.11.0-dev
diff --git a/WORKSPACE b/WORKSPACE
@@ -1,5 +1,9 @@
 workspace(name = "envoy")
 
+load("//bazel:api_repositories.bzl", "envoy_api_dependencies")
+
+envoy_api_dependencies()
+
 load("//bazel:repositories.bzl", "GO_VERSION", "envoy_dependencies")
 load("//bazel:cc_configure.bzl", "cc_configure")
 
@@ -11,10 +15,6 @@ rules_foreign_cc_dependencies()
 
 cc_configure()
 
-load("@envoy_api//bazel:repositories.bzl", "api_dependencies")
-
-api_dependencies()
-
 load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_dependencies")
 
 go_rules_dependencies()

diff --git a/api/STYLE.md b/api/STYLE.md
@@ -123,7 +123,7 @@ In addition, the following conventions should be followed:
   ```
 
 * The [Breaking Change
-  Policy](https://github.com/envoyproxy/envoy/blob/master//CONTRIBUTING.md#breaking-change-policy) describes
+  Policy](https://github.com/envoyproxy/envoy/blob/master/CONTRIBUTING.md#breaking-change-policy) describes
   API versioning, deprecation and compatibility.
 
 ## Package organization