From a16999d54e468d0fe39d6d5d59e62aa8c9c5b6cb Mon Sep 17 00:00:00 2001 From: Chris Paika Date: Tue, 16 Apr 2019 22:04:18 -0400 Subject: [PATCH 1/4] Standardize docker-compose version and yaml extension Signed-off-by: Chris Paika --- docs/root/start/sandboxes/front_proxy.rst | 2 +- docs/root/start/sandboxes/jaeger_native_tracing.rst | 2 +- docs/root/start/sandboxes/jaeger_tracing.rst | 2 +- docs/root/start/sandboxes/zipkin_tracing.rst | 2 +- .../cors/backend/{docker-compose.yml => docker-compose.yaml} | 2 +- .../cors/frontend/{docker-compose.yml => docker-compose.yaml} | 2 +- .../fault-injection/{docker-compose.yml => docker-compose.yaml} | 2 +- .../front-proxy/{docker-compose.yml => docker-compose.yaml} | 0 .../grpc-bridge/{docker-compose.yml => docker-compose.yaml} | 2 +- .../{docker-compose.yml => docker-compose.yaml} | 2 +- .../jaeger-tracing/{docker-compose.yml => docker-compose.yaml} | 2 +- examples/lua/docker-compose.yaml | 2 +- examples/mysql/docker-compose.yaml | 2 +- examples/redis/docker-compose.yaml | 2 +- .../zipkin-tracing/{docker-compose.yml => docker-compose.yaml} | 2 +- 15 files changed, 14 insertions(+), 14 deletions(-) rename examples/cors/backend/{docker-compose.yml => docker-compose.yaml} (97%) rename examples/cors/frontend/{docker-compose.yml => docker-compose.yaml} (97%) rename examples/fault-injection/{docker-compose.yml => docker-compose.yaml} (97%) rename examples/front-proxy/{docker-compose.yml => docker-compose.yaml} (100%) rename examples/grpc-bridge/{docker-compose.yml => docker-compose.yaml} (96%) rename examples/jaeger-native-tracing/{docker-compose.yml => docker-compose.yaml} (99%) rename examples/jaeger-tracing/{docker-compose.yml => docker-compose.yaml} (98%) rename examples/zipkin-tracing/{docker-compose.yml => docker-compose.yaml} (98%) diff --git a/docs/root/start/sandboxes/front_proxy.rst b/docs/root/start/sandboxes/front_proxy.rst index bfcfae2d02fc8..73e12cf1588a6 100644 --- a/docs/root/start/sandboxes/front_proxy.rst +++ b/docs/root/start/sandboxes/front_proxy.rst @@ -16,7 +16,7 @@ Below you can see a graphic showing the docker compose deployment: All incoming requests are routed via the front Envoy, which is acting as a reverse proxy sitting on the edge of the ``envoymesh`` network. Port ``80`` is mapped to port ``8000`` by docker compose -(see :repo:`/examples/front-proxy/docker-compose.yml`). Moreover, notice +(see :repo:`/examples/front-proxy/docker-compose.yaml`). Moreover, notice that all traffic routed by the front Envoy to the service containers is actually routed to the service Envoys (routes setup in :repo:`/examples/front-proxy/front-envoy.yaml`). In turn the service envoys route the request to the flask app via the loopback address (routes setup in diff --git a/docs/root/start/sandboxes/jaeger_native_tracing.rst b/docs/root/start/sandboxes/jaeger_native_tracing.rst index 52bdda5e269f4..07193e03f9740 100644 --- a/docs/root/start/sandboxes/jaeger_native_tracing.rst +++ b/docs/root/start/sandboxes/jaeger_native_tracing.rst @@ -22,7 +22,7 @@ only works on x86-64). All incoming requests are routed via the front Envoy, which is acting as a reverse proxy sitting on the edge of the ``envoymesh`` network. Port ``80`` is mapped to port ``8000`` -by docker compose (see :repo:`/examples/jaeger-native-tracing/docker-compose.yml`). Notice that +by docker compose (see :repo:`/examples/jaeger-native-tracing/docker-compose.yaml`). Notice that all Envoys are configured to collect request traces (e.g., http_connection_manager/config/tracing setup in :repo:`/examples/jaeger-native-tracing/front-envoy-jaeger.yaml`) and setup to propagate the spans generated by the Jaeger tracer to a Jaeger cluster (trace driver setup diff --git a/docs/root/start/sandboxes/jaeger_tracing.rst b/docs/root/start/sandboxes/jaeger_tracing.rst index 4277b60ff5d47..bad25e5bd26fc 100644 --- a/docs/root/start/sandboxes/jaeger_tracing.rst +++ b/docs/root/start/sandboxes/jaeger_tracing.rst @@ -11,7 +11,7 @@ The three containers will be deployed inside a virtual network called ``envoymes All incoming requests are routed via the front Envoy, which is acting as a reverse proxy sitting on the edge of the ``envoymesh`` network. Port ``80`` is mapped to port ``8000`` -by docker compose (see :repo:`/examples/jaeger-tracing/docker-compose.yml`). Notice that +by docker compose (see :repo:`/examples/jaeger-tracing/docker-compose.yaml`). Notice that all Envoys are configured to collect request traces (e.g., http_connection_manager/config/tracing setup in :repo:`/examples/jaeger-tracing/front-envoy-jaeger.yaml`) and setup to propagate the spans generated by the Jaeger tracer to a Jaeger cluster (trace driver setup diff --git a/docs/root/start/sandboxes/zipkin_tracing.rst b/docs/root/start/sandboxes/zipkin_tracing.rst index c26e492960dd4..c64ce82e9f39a 100644 --- a/docs/root/start/sandboxes/zipkin_tracing.rst +++ b/docs/root/start/sandboxes/zipkin_tracing.rst @@ -11,7 +11,7 @@ The three containers will be deployed inside a virtual network called ``envoymes All incoming requests are routed via the front Envoy, which is acting as a reverse proxy sitting on the edge of the ``envoymesh`` network. Port ``80`` is mapped to port ``8000`` -by docker compose (see :repo:`/examples/zipkin-tracing/docker-compose.yml`). Notice that +by docker compose (see :repo:`/examples/zipkin-tracing/docker-compose.yaml`). Notice that all Envoys are configured to collect request traces (e.g., http_connection_manager/config/tracing setup in :repo:`/examples/zipkin-tracing/front-envoy-zipkin.yaml`) and setup to propagate the spans generated by the Zipkin tracer to a Zipkin cluster (trace driver setup diff --git a/examples/cors/backend/docker-compose.yml b/examples/cors/backend/docker-compose.yaml similarity index 97% rename from examples/cors/backend/docker-compose.yml rename to examples/cors/backend/docker-compose.yaml index 62f6bd2bcbb3b..7518eff81ca69 100644 --- a/examples/cors/backend/docker-compose.yml +++ b/examples/cors/backend/docker-compose.yaml @@ -1,4 +1,4 @@ -version: '2' +version: '3.7' services: front-envoy: diff --git a/examples/cors/frontend/docker-compose.yml b/examples/cors/frontend/docker-compose.yaml similarity index 97% rename from examples/cors/frontend/docker-compose.yml rename to examples/cors/frontend/docker-compose.yaml index b29dc7f7d37cd..14686412bad28 100644 --- a/examples/cors/frontend/docker-compose.yml +++ b/examples/cors/frontend/docker-compose.yaml @@ -1,4 +1,4 @@ -version: '2' +version: '3.7' services: front-envoy: diff --git a/examples/fault-injection/docker-compose.yml b/examples/fault-injection/docker-compose.yaml similarity index 97% rename from examples/fault-injection/docker-compose.yml rename to examples/fault-injection/docker-compose.yaml index b3b3f1da27c44..8b9d5081f8d32 100644 --- a/examples/fault-injection/docker-compose.yml +++ b/examples/fault-injection/docker-compose.yaml @@ -1,4 +1,4 @@ -version: '2' +version: '3.7' services: envoy: build: diff --git a/examples/front-proxy/docker-compose.yml b/examples/front-proxy/docker-compose.yaml similarity index 100% rename from examples/front-proxy/docker-compose.yml rename to examples/front-proxy/docker-compose.yaml diff --git a/examples/grpc-bridge/docker-compose.yml b/examples/grpc-bridge/docker-compose.yaml similarity index 96% rename from examples/grpc-bridge/docker-compose.yml rename to examples/grpc-bridge/docker-compose.yaml index 6cc1cf48843b2..39e940699bb58 100644 --- a/examples/grpc-bridge/docker-compose.yml +++ b/examples/grpc-bridge/docker-compose.yaml @@ -1,4 +1,4 @@ -version: '2' +version: '3.7' services: python: diff --git a/examples/jaeger-native-tracing/docker-compose.yml b/examples/jaeger-native-tracing/docker-compose.yaml similarity index 99% rename from examples/jaeger-native-tracing/docker-compose.yml rename to examples/jaeger-native-tracing/docker-compose.yaml index c829cf41732c6..91bd347783ccc 100644 --- a/examples/jaeger-native-tracing/docker-compose.yml +++ b/examples/jaeger-native-tracing/docker-compose.yaml @@ -1,4 +1,4 @@ -version: '2' +version: '3.7' services: front-envoy: diff --git a/examples/jaeger-tracing/docker-compose.yml b/examples/jaeger-tracing/docker-compose.yaml similarity index 98% rename from examples/jaeger-tracing/docker-compose.yml rename to examples/jaeger-tracing/docker-compose.yaml index 2c75265724eaa..4971b7c600bed 100644 --- a/examples/jaeger-tracing/docker-compose.yml +++ b/examples/jaeger-tracing/docker-compose.yaml @@ -1,4 +1,4 @@ -version: '2' +version: '3.7' services: front-envoy: diff --git a/examples/lua/docker-compose.yaml b/examples/lua/docker-compose.yaml index 31ce3501ea1a8..4b412d081e415 100644 --- a/examples/lua/docker-compose.yaml +++ b/examples/lua/docker-compose.yaml @@ -1,4 +1,4 @@ -version: '2' +version: '3.7' services: proxy: diff --git a/examples/mysql/docker-compose.yaml b/examples/mysql/docker-compose.yaml index 0f08d279fa615..8ffab091ebc60 100644 --- a/examples/mysql/docker-compose.yaml +++ b/examples/mysql/docker-compose.yaml @@ -1,4 +1,4 @@ -version: '3.5' +version: '3.7' services: proxy: diff --git a/examples/redis/docker-compose.yaml b/examples/redis/docker-compose.yaml index 0e18c9019c6e8..38e6658a80629 100644 --- a/examples/redis/docker-compose.yaml +++ b/examples/redis/docker-compose.yaml @@ -1,4 +1,4 @@ -version: '2' +version: '3.7' services: proxy: diff --git a/examples/zipkin-tracing/docker-compose.yml b/examples/zipkin-tracing/docker-compose.yaml similarity index 98% rename from examples/zipkin-tracing/docker-compose.yml rename to examples/zipkin-tracing/docker-compose.yaml index 02673d611ee73..947724e2a7eb6 100644 --- a/examples/zipkin-tracing/docker-compose.yml +++ b/examples/zipkin-tracing/docker-compose.yaml @@ -1,4 +1,4 @@ -version: '2' +version: '3.7' services: front-envoy: From 9261c2aebad75aa60892bff0028ac5073950451b Mon Sep 17 00:00:00 2001 From: Chris Paika Date: Tue, 16 Apr 2019 22:18:19 -0400 Subject: [PATCH 2/4] changing the build script name to be consistent with documentation Signed-off-by: Chris Paika --- examples/grpc-bridge/script/{build.sh => build} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename examples/grpc-bridge/script/{build.sh => build} (100%) diff --git a/examples/grpc-bridge/script/build.sh b/examples/grpc-bridge/script/build similarity index 100% rename from examples/grpc-bridge/script/build.sh rename to examples/grpc-bridge/script/build From 9c6b88a5908346c872b501c844c015bbabce1643 Mon Sep 17 00:00:00 2001 From: Chris Paika Date: Wed, 17 Apr 2019 07:19:22 -0400 Subject: [PATCH 3/4] Responding to PR comments Signed-off-by: Chris Paika --- docs/root/start/sandboxes/grpc_bridge.rst | 4 ++-- examples/cors/backend/docker-compose.yaml | 2 +- examples/cors/frontend/docker-compose.yaml | 2 +- examples/fault-injection/docker-compose.yaml | 2 +- examples/front-proxy/docker-compose.yaml | 2 +- examples/grpc-bridge/docker-compose.yaml | 2 +- examples/grpc-bridge/script/{build => build.sh} | 0 examples/jaeger-native-tracing/docker-compose.yaml | 2 +- examples/jaeger-tracing/docker-compose.yaml | 2 +- examples/lua/docker-compose.yaml | 2 +- examples/mysql/docker-compose.yaml | 2 +- examples/redis/docker-compose.yaml | 2 +- examples/zipkin-tracing/docker-compose.yaml | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) rename examples/grpc-bridge/script/{build => build.sh} (100%) diff --git a/docs/root/start/sandboxes/grpc_bridge.rst b/docs/root/start/sandboxes/grpc_bridge.rst index c08b54f1ed218..c3c973b69342e 100644 --- a/docs/root/start/sandboxes/grpc_bridge.rst +++ b/docs/root/start/sandboxes/grpc_bridge.rst @@ -24,9 +24,9 @@ To build the Go gRPC service run:: $ pwd envoy/examples/grpc-bridge $ script/bootstrap - $ script/build + $ script/build.sh -Note: ``build`` requires that your Envoy codebase (or a working copy thereof) is in ``$GOPATH/src/github.com/envoyproxy/envoy``. +Note: ``build.sh`` requires that your Envoy codebase (or a working copy thereof) is in ``$GOPATH/src/github.com/envoyproxy/envoy``. Docker compose ~~~~~~~~~~~~~~ diff --git a/examples/cors/backend/docker-compose.yaml b/examples/cors/backend/docker-compose.yaml index 7518eff81ca69..987b4ef157bab 100644 --- a/examples/cors/backend/docker-compose.yaml +++ b/examples/cors/backend/docker-compose.yaml @@ -1,4 +1,4 @@ -version: '3.7' +version: "3.7" services: front-envoy: diff --git a/examples/cors/frontend/docker-compose.yaml b/examples/cors/frontend/docker-compose.yaml index 14686412bad28..96b19d222e431 100644 --- a/examples/cors/frontend/docker-compose.yaml +++ b/examples/cors/frontend/docker-compose.yaml @@ -1,4 +1,4 @@ -version: '3.7' +version: "3.7" services: front-envoy: diff --git a/examples/fault-injection/docker-compose.yaml b/examples/fault-injection/docker-compose.yaml index 8b9d5081f8d32..fe8ec0c9d68fb 100644 --- a/examples/fault-injection/docker-compose.yaml +++ b/examples/fault-injection/docker-compose.yaml @@ -1,4 +1,4 @@ -version: '3.7' +version: "3.7" services: envoy: build: diff --git a/examples/front-proxy/docker-compose.yaml b/examples/front-proxy/docker-compose.yaml index 3d371f889c694..34491c3636ce0 100644 --- a/examples/front-proxy/docker-compose.yaml +++ b/examples/front-proxy/docker-compose.yaml @@ -1,4 +1,4 @@ -version: '3.7' +version: "3.7" services: front-envoy: diff --git a/examples/grpc-bridge/docker-compose.yaml b/examples/grpc-bridge/docker-compose.yaml index 39e940699bb58..25d5b1fb3cd36 100644 --- a/examples/grpc-bridge/docker-compose.yaml +++ b/examples/grpc-bridge/docker-compose.yaml @@ -1,4 +1,4 @@ -version: '3.7' +version: "3.7" services: python: diff --git a/examples/grpc-bridge/script/build b/examples/grpc-bridge/script/build.sh similarity index 100% rename from examples/grpc-bridge/script/build rename to examples/grpc-bridge/script/build.sh diff --git a/examples/jaeger-native-tracing/docker-compose.yaml b/examples/jaeger-native-tracing/docker-compose.yaml index 91bd347783ccc..3321e110cbb83 100644 --- a/examples/jaeger-native-tracing/docker-compose.yaml +++ b/examples/jaeger-native-tracing/docker-compose.yaml @@ -1,4 +1,4 @@ -version: '3.7' +version: "3.7" services: front-envoy: diff --git a/examples/jaeger-tracing/docker-compose.yaml b/examples/jaeger-tracing/docker-compose.yaml index 4971b7c600bed..6c353fada6f49 100644 --- a/examples/jaeger-tracing/docker-compose.yaml +++ b/examples/jaeger-tracing/docker-compose.yaml @@ -1,4 +1,4 @@ -version: '3.7' +version: "3.7" services: front-envoy: diff --git a/examples/lua/docker-compose.yaml b/examples/lua/docker-compose.yaml index 4b412d081e415..2ee4860cfc48d 100644 --- a/examples/lua/docker-compose.yaml +++ b/examples/lua/docker-compose.yaml @@ -1,4 +1,4 @@ -version: '3.7' +version: "3.7" services: proxy: diff --git a/examples/mysql/docker-compose.yaml b/examples/mysql/docker-compose.yaml index 8ffab091ebc60..d4b8b13e13c1e 100644 --- a/examples/mysql/docker-compose.yaml +++ b/examples/mysql/docker-compose.yaml @@ -1,4 +1,4 @@ -version: '3.7' +version: "3.7" services: proxy: diff --git a/examples/redis/docker-compose.yaml b/examples/redis/docker-compose.yaml index 38e6658a80629..5b2d82a6e1163 100644 --- a/examples/redis/docker-compose.yaml +++ b/examples/redis/docker-compose.yaml @@ -1,4 +1,4 @@ -version: '3.7' +version: "3.7" services: proxy: diff --git a/examples/zipkin-tracing/docker-compose.yaml b/examples/zipkin-tracing/docker-compose.yaml index 947724e2a7eb6..132e752793058 100644 --- a/examples/zipkin-tracing/docker-compose.yaml +++ b/examples/zipkin-tracing/docker-compose.yaml @@ -1,4 +1,4 @@ -version: '3.7' +version: "3.7" services: front-envoy: From 475dfe4523e3137d5cccf833b7b53bfa2417b52a Mon Sep 17 00:00:00 2001 From: Chris Paika Date: Wed, 17 Apr 2019 19:32:57 -0400 Subject: [PATCH 4/4] Standardizing .sh extensions Signed-off-by: Chris Paika --- docs/root/start/sandboxes/grpc_bridge.rst | 2 +- examples/grpc-bridge/Dockerfile-grpc | 2 +- examples/grpc-bridge/script/{bootstrap => bootstrap.sh} | 0 examples/grpc-bridge/script/{grpc_start => grpc_start.sh} | 0 4 files changed, 2 insertions(+), 2 deletions(-) rename examples/grpc-bridge/script/{bootstrap => bootstrap.sh} (100%) rename examples/grpc-bridge/script/{grpc_start => grpc_start.sh} (100%) diff --git a/docs/root/start/sandboxes/grpc_bridge.rst b/docs/root/start/sandboxes/grpc_bridge.rst index c3c973b69342e..aa61e60742699 100644 --- a/docs/root/start/sandboxes/grpc_bridge.rst +++ b/docs/root/start/sandboxes/grpc_bridge.rst @@ -23,7 +23,7 @@ To build the Go gRPC service run:: $ pwd envoy/examples/grpc-bridge - $ script/bootstrap + $ script/bootstrap.sh $ script/build.sh Note: ``build.sh`` requires that your Envoy codebase (or a working copy thereof) is in ``$GOPATH/src/github.com/envoyproxy/envoy``. diff --git a/examples/grpc-bridge/Dockerfile-grpc b/examples/grpc-bridge/Dockerfile-grpc index f8e3cb3ad27a4..679b0a728a01c 100644 --- a/examples/grpc-bridge/Dockerfile-grpc +++ b/examples/grpc-bridge/Dockerfile-grpc @@ -2,6 +2,6 @@ FROM envoyproxy/envoy-dev:latest RUN mkdir /var/log/envoy/ COPY ./bin/service /usr/local/bin/srv -COPY ./script/grpc_start /etc/grpc_start +COPY ./script/grpc_start.sh /etc/grpc_start CMD /etc/grpc_start diff --git a/examples/grpc-bridge/script/bootstrap b/examples/grpc-bridge/script/bootstrap.sh similarity index 100% rename from examples/grpc-bridge/script/bootstrap rename to examples/grpc-bridge/script/bootstrap.sh diff --git a/examples/grpc-bridge/script/grpc_start b/examples/grpc-bridge/script/grpc_start.sh similarity index 100% rename from examples/grpc-bridge/script/grpc_start rename to examples/grpc-bridge/script/grpc_start.sh