configs: Update default container config (#13612)

This updates the defaut container config to: - use the envoyproxy.io website as the default upstream proxy - listen for admin interface on 0.0.0.0 address Fixes #13497 Signed-off-by: Ryan Northey <[email protected]>
envoyproxy · Oct 22, 2020 · 3c24562 · 3c24562
1 parent e647b51
commit 3c24562
Show file tree

Hide file tree

Showing 11 changed files with 19 additions and 19 deletions.
diff --git a/ci/Dockerfile-envoy b/ci/Dockerfile-envoy
@@ -28,7 +28,7 @@ RUN mkdir -p /etc/envoy
 
 ARG ENVOY_BINARY_SUFFIX=_stripped
 ADD ${TARGETPLATFORM}/build_release${ENVOY_BINARY_SUFFIX}/* /usr/local/bin/
-ADD configs/google_com_proxy.yaml /etc/envoy/envoy.yaml
+ADD configs/envoyproxy_io_proxy.yaml /etc/envoy/envoy.yaml
 
 EXPOSE 10000
 

diff --git a/ci/Dockerfile-envoy-alpine b/ci/Dockerfile-envoy-alpine
@@ -1,7 +1,7 @@
 FROM frolvlad/alpine-glibc:alpine-3.12_glibc-2.31
 RUN mkdir -p /etc/envoy
 
-ADD configs/google_com_proxy.yaml /etc/envoy/envoy.yaml
+ADD configs/envoyproxy_io_proxy.yaml /etc/envoy/envoy.yaml
 RUN apk add --no-cache shadow su-exec \
         && addgroup -S envoy && adduser --no-create-home -S envoy -G envoy
 

diff --git a/ci/Dockerfile-envoy-windows b/ci/Dockerfile-envoy-windows
@@ -8,7 +8,7 @@ RUN setx path "%path%;c:\Program Files\envoy"
 ADD ["windows/amd64/envoy.exe", "C:/Program Files/envoy/"]
 
 RUN mkdir "C:\\ProgramData\\envoy"
-ADD ["configs/google_com_proxy.yaml", "C:/ProgramData/envoy/envoy.yaml"]
+ADD ["configs/envoyproxy_io_proxy.yaml", "C:/ProgramData/envoy/envoy.yaml"]
 # Replace temp path with Windows temp path
 RUN powershell -Command "(cat C:\ProgramData\envoy\envoy.yaml -raw) -replace '/tmp/','C:\Windows\Temp\' | Set-Content -Encoding Ascii C:\ProgramData\envoy\envoy.yaml"
 

diff --git a/configs/Dockerfile b/configs/Dockerfile
@@ -1,7 +1,7 @@
 # This configuration will build a Docker container containing
-# an Envoy proxy that routes to Google.
+# an Envoy proxy that routes to envoyproxy.io.
 
 FROM envoyproxy/envoy-dev:latest
 RUN apt-get update
-COPY google_com_proxy.yaml /etc/envoy.yaml
+COPY envoyproxy_io_proxy.yaml /etc/envoy.yaml
 CMD /usr/local/bin/envoy -c /etc/envoy.yaml
diff --git a/configs/configgen.py b/configs/configgen.py
@@ -138,6 +138,6 @@ def generate_config(template_path, template, output_file, **context):
                 external_virtual_hosts=external_virtual_hosts,
                 mongos_servers=mongos_servers)
 
-shutil.copy(os.path.join(SCRIPT_DIR, 'google_com_proxy.yaml'), OUT_DIR)
+shutil.copy(os.path.join(SCRIPT_DIR, 'envoyproxy_io_proxy.yaml'), OUT_DIR)
 shutil.copy(os.path.join(SCRIPT_DIR, 'encapsulate_in_connect.yaml'), OUT_DIR)
 shutil.copy(os.path.join(SCRIPT_DIR, 'terminate_connect.yaml'), OUT_DIR)
diff --git a/configs/google_com_proxy.yaml → configs/envoyproxy_io_proxy.yaml b/configs/google_com_proxy.yaml → configs/envoyproxy_io_proxy.yaml
@@ -3,7 +3,7 @@ admin:
   address:
     socket_address:
       protocol: TCP
-      address: 127.0.0.1
+      address: 0.0.0.0
       port_value: 9901
 static_resources:
   listeners:
@@ -28,28 +28,28 @@ static_resources:
               - match:
                   prefix: "/"
                 route:
-                  host_rewrite_literal: www.google.com
-                  cluster: service_google
+                  host_rewrite_literal: www.envoyproxy.io
+                  cluster: service_envoyproxy_io
           http_filters:
           - name: envoy.filters.http.router
   clusters:
-  - name: service_google
+  - name: service_envoyproxy_io
     connect_timeout: 30s
     type: LOGICAL_DNS
     # Comment out the following line to test on v6 networks
     dns_lookup_family: V4_ONLY
     lb_policy: ROUND_ROBIN
     load_assignment:
-      cluster_name: service_google
+      cluster_name: service_envoyproxy_io
       endpoints:
       - lb_endpoints:
         - endpoint:
             address:
               socket_address:
-                address: www.google.com
+                address: www.envoyproy.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.google.com
+        sni: www.envoyproxy.io
diff --git a/docs/root/start/start.rst b/docs/root/start/start.rst
@@ -32,7 +32,7 @@ more detailed explanation of the configuration file and execution steps for
 the same configuration.
 
 A very minimal Envoy configuration that can be used to validate basic plain HTTP
-proxying is available in :repo:`configs/google_com_proxy.yaml`. This is not
+proxying is available in :repo:`configs/envoyproxy_io_proxy.yaml`. This is not
 intended to represent a realistic Envoy deployment:
 
 .. substitution-code-block:: none
@@ -43,7 +43,7 @@ intended to represent a realistic Envoy deployment:
 
 The Docker image used will contain the latest version of Envoy
 and a basic Envoy configuration. This basic configuration tells
-Envoy to route incoming requests to \*.google.com.
+Envoy to route incoming requests to www.envoyproxy.io.
 
 Simple Configuration
 --------------------

diff --git a/test/config_test/config_test.cc b/test/config_test/config_test.cc
@@ -160,7 +160,7 @@ void testMerge() {
   Api::ApiPtr api = Api::createApiForTest();
 
   const std::string overlay = "static_resources: { clusters: [{name: 'foo'}]}";
-  OptionsImpl options(Server::createTestOptionsImpl("google_com_proxy.yaml", overlay,
+  OptionsImpl options(Server::createTestOptionsImpl("envoyproxy_io_proxy.yaml", overlay,
                                                     Network::Address::IpVersion::v6));
   envoy::config::bootstrap::v3::Bootstrap bootstrap;
   Server::InstanceUtil::loadBootstrapConfig(bootstrap, options,

diff --git a/test/server/config_validation/server_test.cc b/test/server/config_validation/server_test.cc
@@ -134,7 +134,7 @@ TEST_P(ValidationServerTest, NoopLifecycleNotifier) {
 // as-is. (Note, /dev/stdout as an access log file is invalid on Windows, no equivalent /dev/
 // exists.)
 
-auto testing_values = ::testing::Values("front-proxy_front-envoy.yaml", "google_com_proxy.yaml",
+auto testing_values = ::testing::Values("front-proxy_front-envoy.yaml", "envoyproxy_io_proxy.yaml",
 #ifndef WIN32
                                         "grpc-bridge_server_envoy-proxy.yaml",
 #endif

diff --git a/tools/config_validation/validate_fragment.py b/tools/config_validation/validate_fragment.py
@@ -3,7 +3,7 @@
 # Example usage:
 #
 # bazel run //tools/config_validation:validate_fragment -- \
-#   envoy.config.bootstrap.v3.Bootstrap $PWD/configs/google_com_proxy.yaml
+#   envoy.config.bootstrap.v3.Bootstrap $PWD/configs/envoyproxy_io_proxy.yaml
 
 import json
 import pathlib

diff --git a/tools/envoy_collect/envoy_collect.py b/tools/envoy_collect/envoy_collect.py
@@ -4,7 +4,7 @@
 Example use:
 
   ./tools/envoy_collect.py --output-path=./envoy.tar -c
-  ./configs/google_com_proxy.yaml --service-node foo
+  ./configs/envoyproxy_io_proxy.yaml --service-node foo
   <Ctrl-C>
   tar -tvf ./envoy.tar
   -rw------- htuch/eng         0 2017-08-13 21:13 access_0.log