Merge branch 'master' into mpuncel/http2-hc-goaway

* master: dns: preserve custom resolver after channel destruction (envoyproxy#13820) docs: Further updates to quick-start (envoyproxy#13793) wasm: update V8 to v8.7.220.10. (envoyproxy#13568) test: adding a test for CONNECT to an IP address (envoyproxy#13818) [fuzz] Scaled Load balancer fuzz to 60k hosts (envoyproxy#13771) Removed Circle-CI reference. (envoyproxy#13824) wasm: strip only Custom Sections with precompiled Wasm modules. (envoyproxy#13775) examples: Add dynamic configuration (filesystem) sandbox (envoyproxy#13783) apple dns: resolve IP addresses without calling Apple APIs (envoyproxy#13698) Signed-off-by: Michael Puncel <[email protected]>
mpuncel · Oct 30, 2020 · bb0cc29 · bb0cc29
2 parents bbd6e08 + 3a32d23
commit bb0cc29
Show file tree

Hide file tree

Showing 65 changed files with 1,576 additions and 461 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -345,14 +345,6 @@ should only be done to correct a DCO mistake.
 
 ## Triggering CI re-run without making changes
 
-To rerun failed tasks in Circle-CI, add a comment with the line
-
-```
-/retest-circle
-```
-
-in it. This should rebuild only the failed tasks.
-
 To rerun failed tasks in Azure pipelines, add a comment with the line
 
 ```

diff --git a/bazel/external/wee8.BUILD b/bazel/external/wee8.BUILD
@@ -9,15 +9,18 @@ cc_library(
     srcs = [
         "libwee8.a",
     ],
-    hdrs = [
-        "wee8/include/v8-version.h",
-        "wee8/third_party/wasm-api/wasm.hh",
-    ],
+    hdrs =
+        glob([
+            "wee8/include/**/*.h",
+            "wee8/src/**/*.h",
+            "wee8/third_party/wasm-api/wasm.hh",
+        ]),
     copts = [
         "-Wno-range-loop-analysis",
     ],
     defines = ["ENVOY_WASM_V8"],
     includes = [
+        "wee8",
         "wee8/include",
         "wee8/third_party",
     ],

diff --git a/bazel/external/wee8.patch b/bazel/external/wee8.patch
@@ -1,9 +1,10 @@
 # 1. Fix linking with unbundled toolchain on macOS.
 # 2. Increase VSZ limit to 4TiB (allows us to start up to 409 VMs).
 # 3. Fix MSAN linking.
+# 4. Fix Wasm module deserialization (http://crbug.com/v8/11024).
 --- wee8/build/toolchain/gcc_toolchain.gni
 +++ wee8/build/toolchain/gcc_toolchain.gni
-@@ -329,6 +329,8 @@ template("gcc_toolchain") {
+@@ -348,6 +348,8 @@ template("gcc_toolchain") {
          # AIX does not support either -D (deterministic output) or response
          # files.
          command = "$ar -X64 {{arflags}} -r -c -s {{output}} {{inputs}}"
@@ -12,7 +13,7 @@
        } else {
          rspfile = "{{output}}.rsp"
          rspfile_content = "{{inputs}}"
-@@ -507,7 +509,7 @@ template("gcc_toolchain") {
+@@ -543,7 +545,7 @@ template("gcc_toolchain") {
 
        start_group_flag = ""
        end_group_flag = ""
@@ -51,5 +52,17 @@
 -    is_msan && (msan_track_origins == 0 || msan_track_origins == 2)
 +prebuilt_instrumented_libraries_available = false
 
- if (use_libfuzzer && is_linux) {
+ if (use_libfuzzer && (is_linux || is_chromeos)) {
    if (is_asan) {
+--- wee8/src/wasm/module-compiler.cc
++++ wee8/src/wasm/module-compiler.cc
+@@ -2901,6 +2901,9 @@ void CompilationStateImpl::InitializeCompilationProgressAfterDeserialization() {
+       RequiredBaselineTierField::encode(ExecutionTier::kTurbofan) |
+       RequiredTopTierField::encode(ExecutionTier::kTurbofan) |
+       ReachedTierField::encode(ExecutionTier::kTurbofan);
++  finished_events_.Add(CompilationEvent::kFinishedExportWrappers);
++  finished_events_.Add(CompilationEvent::kFinishedBaselineCompilation);
++  finished_events_.Add(CompilationEvent::kFinishedTopTierCompilation);
+   compilation_progress_.assign(module->num_declared_functions,
+                                kProgressAfterDeserialization);
+ }
diff --git a/bazel/repository_locations.bzl b/bazel/repository_locations.bzl
@@ -651,10 +651,10 @@ REPOSITORY_LOCATIONS_SPEC = dict(
         project_name = "V8",
         project_desc = "Google’s open source high-performance JavaScript and WebAssembly engine, written in C++",
         project_url = "https://v8.dev",
-        version = "8.5.210.20",
+        version = "8.7.220.10",
         # This archive was created using https://storage.googleapis.com/envoyproxy-wee8/wee8-archive.sh
         # and contains complete checkout of V8 with all dependencies necessary to build wee8.
-        sha256 = "ef404643d7da6854b76b9fb9950a79a1acbd037b7a26f02c585ac379b0f7dee1",
+        sha256 = "f22734640e0515bc34d1ca3772513aef24374fafa44d0489d3a9a57cadec69fb",
         urls = ["https://storage.googleapis.com/envoyproxy-wee8/wee8-{version}.tar.gz"],
         use_category = ["dataplane_ext"],
         extensions = [
@@ -664,7 +664,7 @@ REPOSITORY_LOCATIONS_SPEC = dict(
             "envoy.filters.network.wasm",
             "envoy.stat_sinks.wasm",
         ],
-        release_date = "2020-08-17",
+        release_date = "2020-10-27",
         cpe = "cpe:2.3:a:google:v8:*",
     ),
     com_googlesource_quiche = dict(
@@ -830,8 +830,8 @@ REPOSITORY_LOCATIONS_SPEC = dict(
         project_name = "WebAssembly for Proxies (C++ host implementation)",
         project_desc = "WebAssembly for Proxies (C++ host implementation)",
         project_url = "https://github.com/proxy-wasm/proxy-wasm-cpp-host",
-        version = "d54b3795e7c3e61015dac2c2110b0da2be999b8e",
-        sha256 = "e95ad57b6b550b039d4baa35c896f7f523e427b7278ba56f22fac6e1bef8c7f0",
+        version = "40fd3d03842c07d65fed907a6b6ed0f89d68d531",
+        sha256 = "b5ae746e66b6209ea0cce86d6c21de99dacbec1da9cdadd53a9ec46bc296a3ba",
         strip_prefix = "proxy-wasm-cpp-host-{version}",
         urls = ["https://github.com/proxy-wasm/proxy-wasm-cpp-host/archive/{version}.tar.gz"],
         use_category = ["dataplane_ext"],
@@ -842,7 +842,7 @@ REPOSITORY_LOCATIONS_SPEC = dict(
             "envoy.filters.network.wasm",
             "envoy.stat_sinks.wasm",
         ],
-        release_date = "2020-10-22",
+        release_date = "2020-10-27",
         cpe = "N/A",
     ),
     emscripten_toolchain = dict(

diff --git a/docs/BUILD b/docs/BUILD
@@ -17,6 +17,7 @@ filegroup(
             "root/**/*.pb",
         ],
         exclude = [
+            "root/**/envoy-dynamic*.yaml",
             # TODO(phlax/windows-dev): figure out how to get this working on windows
             #      "Error: unable to read file: /etc/ssl/certs/ca-certificates.crt"
             "root/configuration/http/http_filters/_include/dns-cache-circuit-breaker.yaml",

diff --git a/docs/redirects.txt b/docs/redirects.txt
@@ -17,3 +17,5 @@ start/install/tools/tools.rst	operations/tools/tools.rst
 start/install/tools/route_table_check_tool.rst	operations/tools/route_table_check_tool.rst
 start/install/tools/schema_validator_check_tool.rst	operations/tools/schema_validator_check_tool.rst
 start/install/tools/config_load_check_tool.rst	operations/tools/config_load_check_tool.rst
+
+start/quick-start.rst	start/quick-start/index.rst
diff --git a/docs/root/start/quick-start.rst b/docs/root/start/quick-start.rst
diff --git a/docs/root/start/_include/envoy-demo.yaml → ...tart/quick-start/_include/envoy-demo.yaml b/docs/root/start/_include/envoy-demo.yaml → ...tart/quick-start/_include/envoy-demo.yaml
diff --git a/docs/root/start/quick-start/_include/envoy-dynamic-cds-demo.yaml b/docs/root/start/quick-start/_include/envoy-dynamic-cds-demo.yaml
@@ -0,0 +1,20 @@
+resources:
+- "@type": type.googleapis.com/envoy.config.cluster.v3.Cluster
+  name: example_proxy_cluster
+  connect_timeout: 1s
+  type: strict_dns
+  http2_protocol_options: {}
+  load_assignment:
+    cluster_name: example_proxy_cluster
+    endpoints:
+    - lb_endpoints:
+      - endpoint:
+          address:
+            socket_address:
+              address: www.envoyproxy.io
+              port_value: 443
+  transport_socket:
+    name: envoy.transport_sockets.tls
+    typed_config:
+      "@type": type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext
+      sni: www.envoyproxy.io