From 233546f9e6cef00df4ec7d0bde58bfec7b1f0397 Mon Sep 17 00:00:00 2001 From: phlax Date: Tue, 8 Jun 2021 03:59:14 +0100 Subject: [PATCH] yaml: Lint example configs (#16841) Signed-off-by: Ryan Northey --- examples/cache/docker-compose.yaml | 10 +++--- examples/cors/backend/docker-compose.yaml | 4 +-- examples/cors/backend/front-envoy.yaml | 6 ++-- examples/cors/frontend/docker-compose.yaml | 2 +- examples/cors/frontend/front-envoy.yaml | 6 ++-- examples/csrf/crosssite/docker-compose.yml | 2 +- examples/csrf/crosssite/front-envoy.yaml | 6 ++-- examples/csrf/samesite/docker-compose.yml | 4 +-- examples/csrf/samesite/front-envoy.yaml | 6 ++-- examples/double-proxy/docker-compose.yaml | 4 +-- .../dynamic-config-cp/docker-compose.yaml | 8 ++--- examples/ext_authz/config/http-service.yaml | 2 +- examples/ext_authz/docker-compose.yaml | 36 +++++++++---------- examples/fault-injection/docker-compose.yaml | 10 +++--- examples/front-proxy/docker-compose.yaml | 20 +++++------ examples/front-proxy/front-envoy.yaml | 14 ++++---- .../grpc-bridge/docker-compose-protos.yaml | 8 ++--- examples/grpc-bridge/docker-compose.yaml | 16 ++++----- examples/gzip/docker-compose.yaml | 6 ++-- examples/gzip/gzip-envoy.yaml | 4 +-- .../jaeger-native-tracing/docker-compose.yaml | 34 +++++++++--------- examples/jaeger-tracing/docker-compose.yaml | 26 +++++++------- .../docker-compose.yaml | 6 ++-- examples/lua/docker-compose.yaml | 8 ++--- examples/lua/envoy.yaml | 2 +- examples/mysql/docker-compose.yaml | 10 +++--- examples/postgres/docker-compose.yaml | 4 +-- examples/redis/docker-compose.yaml | 8 ++--- examples/redis/envoy.yaml | 2 +- .../skywalking-tracing/docker-compose.yaml | 36 +++++++++---------- examples/tls-inspector/docker-compose.yaml | 10 +++--- examples/tls-inspector/envoy.yaml | 6 ++-- examples/tls-sni/docker-compose.yaml | 10 +++--- examples/tls/docker-compose.yaml | 12 +++---- examples/udp/docker-compose.yaml | 4 +-- examples/vrp-litmus/docker-compose.yaml | 4 +-- examples/vrp-local/docker-compose.yaml | 4 +-- examples/wasm-cc/docker-compose-wasm.yaml | 8 ++--- examples/wasm-cc/docker-compose.yaml | 8 ++--- examples/websocket/docker-compose.yaml | 8 ++--- .../win32-front-proxy/docker-compose.yaml | 16 ++++----- examples/win32-front-proxy/front-envoy.yaml | 14 ++++---- examples/zipkin-tracing/docker-compose.yaml | 20 +++++------ 43 files changed, 217 insertions(+), 217 deletions(-) diff --git a/examples/cache/docker-compose.yaml b/examples/cache/docker-compose.yaml index 98619eba73ce..d13c1353816c 100644 --- a/examples/cache/docker-compose.yaml +++ b/examples/cache/docker-compose.yaml @@ -6,22 +6,22 @@ services: context: . dockerfile: Dockerfile-frontenvoy ports: - - "8000:8000" + - "8000:8000" service1: build: context: . dockerfile: Dockerfile-service volumes: - - ./responses.yaml:/etc/responses.yaml + - ./responses.yaml:/etc/responses.yaml environment: - - SERVICE_NAME=1 + - SERVICE_NAME=1 service2: build: context: . dockerfile: Dockerfile-service volumes: - - ./responses.yaml:/etc/responses.yaml + - ./responses.yaml:/etc/responses.yaml environment: - - SERVICE_NAME=2 + - SERVICE_NAME=2 diff --git a/examples/cors/backend/docker-compose.yaml b/examples/cors/backend/docker-compose.yaml index ae64b59026c3..00a29c16bf6b 100644 --- a/examples/cors/backend/docker-compose.yaml +++ b/examples/cors/backend/docker-compose.yaml @@ -6,8 +6,8 @@ services: context: . dockerfile: Dockerfile-frontenvoy ports: - - "8002:8000" - - "8003:8001" + - "8002:8000" + - "8003:8001" backend-service: build: diff --git a/examples/cors/backend/front-envoy.yaml b/examples/cors/backend/front-envoy.yaml index 2c64fad1e09e..3b480ab24fdc 100644 --- a/examples/cors/backend/front-envoy.yaml +++ b/examples/cors/backend/front-envoy.yaml @@ -12,9 +12,9 @@ static_resources: codec_type: AUTO stat_prefix: ingress_http access_log: - - name: envoy.access_loggers.stdout - typed_config: - "@type": type.googleapis.com/envoy.extensions.access_loggers.stream.v3.StdoutAccessLog + - name: envoy.access_loggers.stdout + typed_config: + "@type": type.googleapis.com/envoy.extensions.access_loggers.stream.v3.StdoutAccessLog route_config: name: local_route virtual_hosts: diff --git a/examples/cors/frontend/docker-compose.yaml b/examples/cors/frontend/docker-compose.yaml index 9ed7c014c322..20b6b81a5e9c 100644 --- a/examples/cors/frontend/docker-compose.yaml +++ b/examples/cors/frontend/docker-compose.yaml @@ -6,7 +6,7 @@ services: context: . dockerfile: Dockerfile-frontenvoy ports: - - "8000:8000" + - "8000:8000" frontend-service: build: diff --git a/examples/cors/frontend/front-envoy.yaml b/examples/cors/frontend/front-envoy.yaml index 51318fb26243..50fa897b238e 100644 --- a/examples/cors/frontend/front-envoy.yaml +++ b/examples/cors/frontend/front-envoy.yaml @@ -12,9 +12,9 @@ static_resources: codec_type: AUTO stat_prefix: ingress_http access_log: - - name: envoy.access_loggers.stdout - typed_config: - "@type": type.googleapis.com/envoy.extensions.access_loggers.stream.v3.StdoutAccessLog + - name: envoy.access_loggers.stdout + typed_config: + "@type": type.googleapis.com/envoy.extensions.access_loggers.stream.v3.StdoutAccessLog route_config: name: local_route virtual_hosts: diff --git a/examples/csrf/crosssite/docker-compose.yml b/examples/csrf/crosssite/docker-compose.yml index bc6e93e22f71..feb091e90671 100644 --- a/examples/csrf/crosssite/docker-compose.yml +++ b/examples/csrf/crosssite/docker-compose.yml @@ -6,7 +6,7 @@ services: context: . dockerfile: Dockerfile-frontenvoy ports: - - "8002:8000" + - "8002:8000" service: build: diff --git a/examples/csrf/crosssite/front-envoy.yaml b/examples/csrf/crosssite/front-envoy.yaml index 18f8be37fa47..a6cb4f9eb596 100644 --- a/examples/csrf/crosssite/front-envoy.yaml +++ b/examples/csrf/crosssite/front-envoy.yaml @@ -12,9 +12,9 @@ static_resources: codec_type: AUTO stat_prefix: ingress_http access_log: - - name: envoy.access_loggers.stdout - typed_config: - "@type": type.googleapis.com/envoy.extensions.access_loggers.stream.v3.StdoutAccessLog + - name: envoy.access_loggers.stdout + typed_config: + "@type": type.googleapis.com/envoy.extensions.access_loggers.stream.v3.StdoutAccessLog route_config: name: local_route virtual_hosts: diff --git a/examples/csrf/samesite/docker-compose.yml b/examples/csrf/samesite/docker-compose.yml index 0f7a92d16186..2ed503341fe2 100644 --- a/examples/csrf/samesite/docker-compose.yml +++ b/examples/csrf/samesite/docker-compose.yml @@ -6,8 +6,8 @@ services: context: . dockerfile: Dockerfile-frontenvoy ports: - - "8000:8000" - - "8001:8001" + - "8000:8000" + - "8001:8001" service: build: diff --git a/examples/csrf/samesite/front-envoy.yaml b/examples/csrf/samesite/front-envoy.yaml index de99d4a8c4f1..57773f803257 100644 --- a/examples/csrf/samesite/front-envoy.yaml +++ b/examples/csrf/samesite/front-envoy.yaml @@ -12,9 +12,9 @@ static_resources: codec_type: AUTO stat_prefix: ingress_http access_log: - - name: envoy.access_loggers.stdout - typed_config: - "@type": type.googleapis.com/envoy.extensions.access_loggers.stream.v3.StdoutAccessLog + - name: envoy.access_loggers.stdout + typed_config: + "@type": type.googleapis.com/envoy.extensions.access_loggers.stream.v3.StdoutAccessLog route_config: name: local_route virtual_hosts: diff --git a/examples/double-proxy/docker-compose.yaml b/examples/double-proxy/docker-compose.yaml index 5b4d7b6452ee..5d51b65186c8 100644 --- a/examples/double-proxy/docker-compose.yaml +++ b/examples/double-proxy/docker-compose.yaml @@ -8,7 +8,7 @@ services: networks: edge: ports: - - "10000:10000" + - "10000:10000" app: build: @@ -25,7 +25,7 @@ services: networks: postgres-frontend: aliases: - - postgres + - postgres postgres-in-between: proxy-postgres-backend: diff --git a/examples/dynamic-config-cp/docker-compose.yaml b/examples/dynamic-config-cp/docker-compose.yaml index dde3bb3696bc..7431c17f0754 100644 --- a/examples/dynamic-config-cp/docker-compose.yaml +++ b/examples/dynamic-config-cp/docker-compose.yaml @@ -6,11 +6,11 @@ services: context: . dockerfile: Dockerfile-proxy depends_on: - - service1 - - service2 + - service1 + - service2 ports: - - 10000:10000 - - 19000:19000 + - 10000:10000 + - 19000:19000 service1: image: jmalloc/echo-server diff --git a/examples/ext_authz/config/http-service.yaml b/examples/ext_authz/config/http-service.yaml index 581f48961d13..4bc3fc9ea39b 100644 --- a/examples/ext_authz/config/http-service.yaml +++ b/examples/ext_authz/config/http-service.yaml @@ -31,7 +31,7 @@ static_resources: server_uri: uri: ext_authz cluster: ext_authz-http-service - timeout: 0.250s + timeout: 0.250s authorization_response: allowed_upstream_headers: patterns: diff --git a/examples/ext_authz/docker-compose.yaml b/examples/ext_authz/docker-compose.yaml index 1805409cc65d..947c8e853b40 100644 --- a/examples/ext_authz/docker-compose.yaml +++ b/examples/ext_authz/docker-compose.yaml @@ -6,53 +6,53 @@ services: context: . dockerfile: Dockerfile-frontenvoy environment: - - FRONT_ENVOY_YAML + - FRONT_ENVOY_YAML networks: - - envoymesh + - envoymesh ports: - - "8000:8000" + - "8000:8000" ext_authz-http-service: build: context: ./auth dockerfile: http-service/Dockerfile volumes: - - ./users.json:/etc/users.json + - ./users.json:/etc/users.json environment: - - USERS=/etc/users.json + - USERS=/etc/users.json networks: - - envoymesh + - envoymesh ext_authz-grpc-service: build: context: ./auth dockerfile: grpc-service/Dockerfile volumes: - - ./users.json:/etc/users.json + - ./users.json:/etc/users.json networks: - - envoymesh + - envoymesh ext_authz-opa-service: image: openpolicyagent/opa:0.25.1-istio volumes: - - ./config/opa-service/policy.rego:/etc/policy.rego + - ./config/opa-service/policy.rego:/etc/policy.rego command: - - run - - --log-level=debug - - --server - - --log-format=json-pretty - - --set=plugins.envoy_ext_authz_grpc.addr=:9002 - - --set=decision_logs.console=true - - /etc/policy.rego + - run + - --log-level=debug + - --server + - --log-format=json-pretty + - --set=plugins.envoy_ext_authz_grpc.addr=:9002 + - --set=decision_logs.console=true + - /etc/policy.rego networks: - - envoymesh + - envoymesh upstream-service: build: context: ./upstream dockerfile: service/Dockerfile networks: - - envoymesh + - envoymesh networks: envoymesh: {} diff --git a/examples/fault-injection/docker-compose.yaml b/examples/fault-injection/docker-compose.yaml index 0a7cb9988c14..7d933eac2eb8 100644 --- a/examples/fault-injection/docker-compose.yaml +++ b/examples/fault-injection/docker-compose.yaml @@ -6,16 +6,16 @@ services: dockerfile: Dockerfile-envoy command: /usr/local/bin/envoy -c /etc/envoy.yaml volumes: - - ./runtime:/srv/runtime + - ./runtime:/srv/runtime networks: - - envoymesh + - envoymesh ports: - - 9211:9211 + - 9211:9211 backend: image: kennethreitz/httpbin@sha256:2c7abc4803080c22928265744410173b6fea3b898872c01c5fd0f0f9df4a59fb networks: - - envoymesh + - envoymesh ports: - - 8080:80 + - 8080:80 networks: envoymesh: {} diff --git a/examples/front-proxy/docker-compose.yaml b/examples/front-proxy/docker-compose.yaml index 4deb35d7cb9b..2bc2f0f48afd 100644 --- a/examples/front-proxy/docker-compose.yaml +++ b/examples/front-proxy/docker-compose.yaml @@ -6,33 +6,33 @@ services: context: . dockerfile: Dockerfile-frontenvoy networks: - - envoymesh + - envoymesh ports: - - "8080:8080" - - "8443:8443" - - "8001:8001" + - "8080:8080" + - "8443:8443" + - "8001:8001" service1: build: context: . dockerfile: Dockerfile-service volumes: - - ./service-envoy.yaml:/etc/service-envoy.yaml + - ./service-envoy.yaml:/etc/service-envoy.yaml networks: - - envoymesh + - envoymesh environment: - - SERVICE_NAME=1 + - SERVICE_NAME=1 service2: build: context: . dockerfile: Dockerfile-service volumes: - - ./service-envoy.yaml:/etc/service-envoy.yaml + - ./service-envoy.yaml:/etc/service-envoy.yaml networks: - - envoymesh + - envoymesh environment: - - SERVICE_NAME=2 + - SERVICE_NAME=2 networks: envoymesh: {} diff --git a/examples/front-proxy/front-envoy.yaml b/examples/front-proxy/front-envoy.yaml index b97ac7b278fa..bbd124295898 100644 --- a/examples/front-proxy/front-envoy.yaml +++ b/examples/front-proxy/front-envoy.yaml @@ -156,10 +156,10 @@ admin: port_value: 8001 layered_runtime: layers: - - name: static_layer_0 - static_layer: - envoy: - resource_limits: - listener: - example_listener_name: - connection_limit: 10000 + - name: static_layer_0 + static_layer: + envoy: + resource_limits: + listener: + example_listener_name: + connection_limit: 10000 diff --git a/examples/grpc-bridge/docker-compose-protos.yaml b/examples/grpc-bridge/docker-compose-protos.yaml index 543fe4bf5aca..d21ca8bc5a24 100644 --- a/examples/grpc-bridge/docker-compose-protos.yaml +++ b/examples/grpc-bridge/docker-compose-protos.yaml @@ -9,13 +9,13 @@ services: image: grpc/go command: protoc --go_out=plugins=grpc:/stubs -I/protos /protos/kv.proto volumes: - - ./protos:/protos - - ./server/kv:/stubs + - ./protos:/protos + - ./server/kv:/stubs # $ docker run -ti -v $(pwd):/protos -v $(pwd)/stubs:/stubs grpc/python python -m grpc.tools.protoc --python_out=/stubs --grpc_python_out=/stubs -I/protos /protos/kv.proto stubs_python: image: grpc/python command: python -m grpc.tools.protoc --python_out=/stubs --grpc_python_out=/stubs -I/protos /protos/kv.proto volumes: - - ./protos:/protos - - ./client/kv:/stubs + - ./protos:/protos + - ./client/kv:/stubs diff --git a/examples/grpc-bridge/docker-compose.yaml b/examples/grpc-bridge/docker-compose.yaml index d709403011e1..7d6db81d6a35 100644 --- a/examples/grpc-bridge/docker-compose.yaml +++ b/examples/grpc-bridge/docker-compose.yaml @@ -8,11 +8,11 @@ services: build: context: server ports: - - "8081:8081" + - "8081:8081" networks: envoymesh: aliases: - - kv-backend-service + - kv-backend-service grpc-server-proxy: build: @@ -21,9 +21,9 @@ services: networks: envoymesh: aliases: - - kv-backend-proxy + - kv-backend-proxy ports: - - "8811:8811" + - "8811:8811" # Requires the build of the stubs first grpc-client: @@ -31,9 +31,9 @@ services: build: context: client environment: - - CLIENT_PROXY=http://kv-client-proxy:9911 + - CLIENT_PROXY=http://kv-client-proxy:9911 networks: - - envoymesh + - envoymesh grpc-client-proxy: build: @@ -42,9 +42,9 @@ services: networks: envoymesh: aliases: - - kv-client-proxy + - kv-client-proxy ports: - - "9911:9911" + - "9911:9911" networks: envoymesh: {} diff --git a/examples/gzip/docker-compose.yaml b/examples/gzip/docker-compose.yaml index 8043462341cd..ea9a094922fe 100644 --- a/examples/gzip/docker-compose.yaml +++ b/examples/gzip/docker-compose.yaml @@ -5,9 +5,9 @@ services: context: . dockerfile: Dockerfile-gzip ports: - - "9901:9901" - - "9902:9902" - - "10000:10000" + - "9901:9901" + - "9902:9902" + - "10000:10000" service: build: diff --git a/examples/gzip/gzip-envoy.yaml b/examples/gzip/gzip-envoy.yaml index 4aba4e64cdc0..034333fc5aae 100644 --- a/examples/gzip/gzip-envoy.yaml +++ b/examples/gzip/gzip-envoy.yaml @@ -29,7 +29,7 @@ static_resources: common_config: min_content_length: 100 content_type: - - application/json + - application/json disable_on_etag_header: true compressor_library: name: text_optimized @@ -68,7 +68,7 @@ static_resources: common_config: min_content_length: 100 content_type: - - text/plain + - text/plain disable_on_etag_header: true compressor_library: name: text_optimized diff --git a/examples/jaeger-native-tracing/docker-compose.yaml b/examples/jaeger-native-tracing/docker-compose.yaml index 07c9c01c0bf0..5294cffd99aa 100644 --- a/examples/jaeger-native-tracing/docker-compose.yaml +++ b/examples/jaeger-native-tracing/docker-compose.yaml @@ -6,49 +6,49 @@ services: context: . dockerfile: Dockerfile-frontenvoy networks: - - envoymesh + - envoymesh ports: - - "8000:8000" + - "8000:8000" dns: - - 8.8.8.8 - - 8.8.4.4 + - 8.8.8.8 + - 8.8.4.4 service1: build: context: ../front-proxy dockerfile: Dockerfile-jaeger-service volumes: - - ./service1-envoy-jaeger.yaml:/etc/service-envoy.yaml + - ./service1-envoy-jaeger.yaml:/etc/service-envoy.yaml networks: - - envoymesh + - envoymesh environment: - - SERVICE_NAME=1 + - SERVICE_NAME=1 dns: - - 8.8.8.8 - - 8.8.4.4 + - 8.8.8.8 + - 8.8.4.4 service2: build: context: ../front-proxy dockerfile: Dockerfile-jaeger-service volumes: - - ./service2-envoy-jaeger.yaml:/etc/service-envoy.yaml + - ./service2-envoy-jaeger.yaml:/etc/service-envoy.yaml networks: - - envoymesh + - envoymesh environment: - - SERVICE_NAME=2 + - SERVICE_NAME=2 dns: - - 8.8.8.8 - - 8.8.4.4 + - 8.8.8.8 + - 8.8.4.4 jaeger: image: jaegertracing/all-in-one environment: - - COLLECTOR_ZIPKIN_HTTP_PORT=9411 + - COLLECTOR_ZIPKIN_HTTP_PORT=9411 networks: - - envoymesh + - envoymesh ports: - - "16686:16686" + - "16686:16686" networks: envoymesh: {} diff --git a/examples/jaeger-tracing/docker-compose.yaml b/examples/jaeger-tracing/docker-compose.yaml index 061ea802e166..a803fa94c28d 100644 --- a/examples/jaeger-tracing/docker-compose.yaml +++ b/examples/jaeger-tracing/docker-compose.yaml @@ -6,42 +6,42 @@ services: context: . dockerfile: Dockerfile-frontenvoy networks: - - envoymesh + - envoymesh ports: - - "8000:8000" - - "8001:8001" + - "8000:8000" + - "8001:8001" service1: build: context: ../front-proxy dockerfile: Dockerfile-service volumes: - - ./service1-envoy-jaeger.yaml:/etc/service-envoy.yaml + - ./service1-envoy-jaeger.yaml:/etc/service-envoy.yaml networks: - - envoymesh + - envoymesh environment: - - SERVICE_NAME=1 + - SERVICE_NAME=1 service2: build: context: ../front-proxy dockerfile: Dockerfile-service volumes: - - ./service2-envoy-jaeger.yaml:/etc/service-envoy.yaml + - ./service2-envoy-jaeger.yaml:/etc/service-envoy.yaml networks: - - envoymesh + - envoymesh environment: - - SERVICE_NAME=2 + - SERVICE_NAME=2 jaeger: image: jaegertracing/all-in-one environment: - - COLLECTOR_ZIPKIN_HTTP_PORT=9411 + - COLLECTOR_ZIPKIN_HTTP_PORT=9411 networks: - - envoymesh + - envoymesh ports: - - "9411:9411" - - "16686:16686" + - "9411:9411" + - "16686:16686" networks: envoymesh: {} diff --git a/examples/load-reporting-service/docker-compose.yaml b/examples/load-reporting-service/docker-compose.yaml index 3582e8744c68..3298a8287a01 100644 --- a/examples/load-reporting-service/docker-compose.yaml +++ b/examples/load-reporting-service/docker-compose.yaml @@ -6,7 +6,7 @@ services: context: . dockerfile: Dockerfile-envoy ports: - - "80-81:80" + - "80-81:80" http_service: build: @@ -18,6 +18,6 @@ services: context: . dockerfile: Dockerfile-lrs volumes: - - /go/src/github.com/envoyproxy/envoy/examples/load-reporting-service + - /go/src/github.com/envoyproxy/envoy/examples/load-reporting-service ports: - - "18000:18000" + - "18000:18000" diff --git a/examples/lua/docker-compose.yaml b/examples/lua/docker-compose.yaml index e21a52c2be0a..f1d36fba7339 100644 --- a/examples/lua/docker-compose.yaml +++ b/examples/lua/docker-compose.yaml @@ -6,18 +6,18 @@ services: context: . dockerfile: Dockerfile-proxy networks: - - envoymesh + - envoymesh ports: - - "8000:8000" + - "8000:8000" web_service: build: context: . dockerfile: Dockerfile-web-service networks: - - envoymesh + - envoymesh ports: - - "8080:80" + - "8080:80" networks: envoymesh: {} diff --git a/examples/lua/envoy.yaml b/examples/lua/envoy.yaml index a9cc2555282e..2876d1e9d8cb 100644 --- a/examples/lua/envoy.yaml +++ b/examples/lua/envoy.yaml @@ -42,7 +42,7 @@ static_resources: clusters: - name: web_service - type: STRICT_DNS # static + type: STRICT_DNS # static lb_policy: ROUND_ROBIN load_assignment: cluster_name: web_service diff --git a/examples/mysql/docker-compose.yaml b/examples/mysql/docker-compose.yaml index 22c46dc72e7a..42a880eac877 100644 --- a/examples/mysql/docker-compose.yaml +++ b/examples/mysql/docker-compose.yaml @@ -6,19 +6,19 @@ services: context: . dockerfile: Dockerfile-proxy networks: - - envoymesh + - envoymesh ports: - - "1999:1999" - - "8001:8001" + - "1999:1999" + - "8001:8001" mysql: build: context: . dockerfile: Dockerfile-mysql networks: - - envoymesh + - envoymesh environment: - - MYSQL_ALLOW_EMPTY_PASSWORD=yes + - MYSQL_ALLOW_EMPTY_PASSWORD=yes networks: envoymesh: diff --git a/examples/postgres/docker-compose.yaml b/examples/postgres/docker-compose.yaml index c4073f142225..0532125d5913 100644 --- a/examples/postgres/docker-compose.yaml +++ b/examples/postgres/docker-compose.yaml @@ -8,8 +8,8 @@ services: networks: envoymesh: ports: - - "1999:1999" - - "8001:8001" + - "1999:1999" + - "8001:8001" command: "/usr/local/bin/envoy -c /etc/envoy.yaml -l debug" postgres: diff --git a/examples/redis/docker-compose.yaml b/examples/redis/docker-compose.yaml index 1dc0b9e21dd2..8dc223a2f5d2 100644 --- a/examples/redis/docker-compose.yaml +++ b/examples/redis/docker-compose.yaml @@ -6,10 +6,10 @@ services: context: . dockerfile: Dockerfile-proxy networks: - - envoymesh + - envoymesh ports: - - "1999:1999" - - "8001:8001" + - "1999:1999" + - "8001:8001" redis: build: @@ -18,7 +18,7 @@ services: networks: envoymesh: aliases: - - redis_server + - redis_server networks: envoymesh: {} diff --git a/examples/redis/envoy.yaml b/examples/redis/envoy.yaml index 1960f7925daf..7af3a0e196b0 100644 --- a/examples/redis/envoy.yaml +++ b/examples/redis/envoy.yaml @@ -18,7 +18,7 @@ static_resources: cluster: redis_cluster clusters: - name: redis_cluster - type: STRICT_DNS # static + type: STRICT_DNS # static lb_policy: MAGLEV load_assignment: cluster_name: redis_cluster diff --git a/examples/skywalking-tracing/docker-compose.yaml b/examples/skywalking-tracing/docker-compose.yaml index e09ddb4b141a..9ae58205f4e7 100644 --- a/examples/skywalking-tracing/docker-compose.yaml +++ b/examples/skywalking-tracing/docker-compose.yaml @@ -6,43 +6,43 @@ services: context: . dockerfile: Dockerfile-frontenvoy networks: - - envoymesh + - envoymesh ports: - - 8000:8000 - - 8001:8001 + - 8000:8000 + - 8001:8001 depends_on: - - skywalking-oap + - skywalking-oap # First service. service1: build: context: ../front-proxy dockerfile: Dockerfile-service volumes: - - ./service1-envoy-skywalking.yaml:/etc/service-envoy.yaml + - ./service1-envoy-skywalking.yaml:/etc/service-envoy.yaml networks: - - envoymesh + - envoymesh environment: - - SERVICE_NAME=1 + - SERVICE_NAME=1 depends_on: - - skywalking-oap + - skywalking-oap # Second service. service2: build: context: ../front-proxy dockerfile: Dockerfile-service volumes: - - ./service2-envoy-skywalking.yaml:/etc/service-envoy.yaml + - ./service2-envoy-skywalking.yaml:/etc/service-envoy.yaml networks: - - envoymesh + - envoymesh environment: - - SERVICE_NAME=2 + - SERVICE_NAME=2 depends_on: - - skywalking-oap + - skywalking-oap # Skywalking components. elasticsearch: image: elasticsearch:7.9.2 networks: - - envoymesh + - envoymesh healthcheck: test: ["CMD-SHELL", "curl --silent --fail localhost:9200/_cluster/health || exit 1"] interval: 30s @@ -58,9 +58,9 @@ services: skywalking-oap: image: apache/skywalking-oap-server:8.4.0-es7 networks: - - envoymesh + - envoymesh depends_on: - - elasticsearch + - elasticsearch environment: SW_STORAGE: elasticsearch7 SW_STORAGE_ES_CLUSTER_NODES: elasticsearch:9200 @@ -74,11 +74,11 @@ services: skywalking-ui: image: apache/skywalking-ui:8.4.0 networks: - - envoymesh + - envoymesh depends_on: - - skywalking-oap + - skywalking-oap ports: - - 8080:8080 + - 8080:8080 environment: SW_OAP_ADDRESS: skywalking-oap:12800 networks: diff --git a/examples/tls-inspector/docker-compose.yaml b/examples/tls-inspector/docker-compose.yaml index c2fd6b665192..879aa860d466 100644 --- a/examples/tls-inspector/docker-compose.yaml +++ b/examples/tls-inspector/docker-compose.yaml @@ -6,23 +6,23 @@ services: context: . dockerfile: Dockerfile ports: - - "10000:10000" - - "12345:12345" + - "10000:10000" + - "12345:12345" service-https-http2: image: mendhak/http-https-echo hostname: service-https-http2 environment: - - HTTP_PORT=0 + - HTTP_PORT=0 service-https-http1.1: image: mendhak/http-https-echo hostname: service-https-http1.1 environment: - - HTTP_PORT=0 + - HTTP_PORT=0 service-http: image: mendhak/http-https-echo hostname: service-http environment: - - HTTPS_PORT=0 + - HTTPS_PORT=0 diff --git a/examples/tls-inspector/envoy.yaml b/examples/tls-inspector/envoy.yaml index 634f82075de0..b8e444dae1f2 100644 --- a/examples/tls-inspector/envoy.yaml +++ b/examples/tls-inspector/envoy.yaml @@ -11,9 +11,9 @@ static_resources: address: 0.0.0.0 port_value: 10000 listener_filters: - - name: "envoy.filters.listener.tls_inspector" - typed_config: - "@type": type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector + - name: "envoy.filters.listener.tls_inspector" + typed_config: + "@type": type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector filter_chains: - filter_chain_match: transport_protocol: tls diff --git a/examples/tls-sni/docker-compose.yaml b/examples/tls-sni/docker-compose.yaml index 0c5fbd4ac516..a76732c16195 100644 --- a/examples/tls-sni/docker-compose.yaml +++ b/examples/tls-sni/docker-compose.yaml @@ -6,29 +6,29 @@ services: context: . dockerfile: Dockerfile ports: - - "10000:10000" + - "10000:10000" proxy-client: build: context: . dockerfile: Dockerfile-client ports: - - "20000:10000" + - "20000:10000" http-upstream1: image: mendhak/http-https-echo hostname: http-upstream1 environment: - - HTTPS_PORT=0 + - HTTPS_PORT=0 http-upstream2: image: mendhak/http-https-echo hostname: http-upstream2 environment: - - HTTPS_PORT=0 + - HTTPS_PORT=0 https-upstream3: image: mendhak/http-https-echo hostname: https-upstream3 environment: - - HTTP_PORT=0 + - HTTP_PORT=0 diff --git a/examples/tls/docker-compose.yaml b/examples/tls/docker-compose.yaml index 1db7809a2220..46b9a41f14c9 100644 --- a/examples/tls/docker-compose.yaml +++ b/examples/tls/docker-compose.yaml @@ -6,37 +6,37 @@ services: context: . dockerfile: Dockerfile-proxy-https-http ports: - - "10000:10000" + - "10000:10000" proxy-https-to-https: build: context: . dockerfile: Dockerfile-proxy-https-https ports: - - "10001:10000" + - "10001:10000" proxy-http-to-https: build: context: . dockerfile: Dockerfile-proxy-http-https ports: - - "10002:10000" + - "10002:10000" proxy-https-passthrough: build: context: . dockerfile: Dockerfile-proxy-https-passthrough ports: - - "10003:10000" + - "10003:10000" service-http: image: mendhak/http-https-echo hostname: service-http environment: - - HTTPS_PORT=0 + - HTTPS_PORT=0 service-https: image: mendhak/http-https-echo hostname: service-https environment: - - HTTP_PORT=0 + - HTTP_PORT=0 diff --git a/examples/udp/docker-compose.yaml b/examples/udp/docker-compose.yaml index 1127d4894e52..fa17ea189304 100644 --- a/examples/udp/docker-compose.yaml +++ b/examples/udp/docker-compose.yaml @@ -6,8 +6,8 @@ services: context: . dockerfile: Dockerfile ports: - - "10000:10000/udp" - - "10001:10001" + - "10000:10000/udp" + - "10001:10001" service-udp: image: mendhak/udp-listener diff --git a/examples/vrp-litmus/docker-compose.yaml b/examples/vrp-litmus/docker-compose.yaml index 46eefcafb9aa..db11603fa012 100644 --- a/examples/vrp-litmus/docker-compose.yaml +++ b/examples/vrp-litmus/docker-compose.yaml @@ -9,9 +9,9 @@ services: ENVOY_EDGE_EXTRA_ARGS: "" ENVOY_ORIGIN_EXTRA_ARGS: "" networks: - - envoymesh + - envoymesh ports: - - "10000:10000" + - "10000:10000" networks: envoymesh: {} diff --git a/examples/vrp-local/docker-compose.yaml b/examples/vrp-local/docker-compose.yaml index 46eefcafb9aa..db11603fa012 100644 --- a/examples/vrp-local/docker-compose.yaml +++ b/examples/vrp-local/docker-compose.yaml @@ -9,9 +9,9 @@ services: ENVOY_EDGE_EXTRA_ARGS: "" ENVOY_ORIGIN_EXTRA_ARGS: "" networks: - - envoymesh + - envoymesh ports: - - "10000:10000" + - "10000:10000" networks: envoymesh: {} diff --git a/examples/wasm-cc/docker-compose-wasm.yaml b/examples/wasm-cc/docker-compose-wasm.yaml index 32caf4245c27..0f3c45f09ce1 100644 --- a/examples/wasm-cc/docker-compose-wasm.yaml +++ b/examples/wasm-cc/docker-compose-wasm.yaml @@ -8,8 +8,8 @@ services: && cp -a bazel-bin/examples/wasm-cc/* /build" working_dir: /source volumes: - - ../..:/source - - ./lib:/build + - ../..:/source + - ./lib:/build wasm_compile: image: envoyproxy/envoy-build-ubuntu:55d9e4719d2bd0accce8f829b44dab70cd42112a @@ -18,5 +18,5 @@ services: && cp -a bazel-bin/examples/wasm-cc/* /build" working_dir: /source volumes: - - ../..:/source - - ./lib:/build + - ../..:/source + - ./lib:/build diff --git a/examples/wasm-cc/docker-compose.yaml b/examples/wasm-cc/docker-compose.yaml index 8e9f1aacbcb0..948de012b98b 100644 --- a/examples/wasm-cc/docker-compose.yaml +++ b/examples/wasm-cc/docker-compose.yaml @@ -6,18 +6,18 @@ services: context: . dockerfile: Dockerfile-proxy depends_on: - - web_service + - web_service networks: - - envoymesh + - envoymesh ports: - - "8000:8000" + - "8000:8000" web_service: build: context: . dockerfile: Dockerfile-web-service networks: - - envoymesh + - envoymesh networks: envoymesh: {} diff --git a/examples/websocket/docker-compose.yaml b/examples/websocket/docker-compose.yaml index 0435bfddaec2..14cf5f983e4e 100644 --- a/examples/websocket/docker-compose.yaml +++ b/examples/websocket/docker-compose.yaml @@ -6,21 +6,21 @@ services: context: . dockerfile: Dockerfile-proxy-ws ports: - - "10000:10000" + - "10000:10000" proxy-wss-wss: build: context: . dockerfile: Dockerfile-proxy-wss ports: - - "20000:10000" + - "20000:10000" proxy-wss-passthrough: build: context: . dockerfile: Dockerfile-proxy-wss-passthrough ports: - - "30000:10000" + - "30000:10000" service-ws: image: solsson/websocat @@ -32,4 +32,4 @@ services: hostname: service-wss command: wss-listen:0.0.0.0:443 literalreply:"[wss] HELO" --pkcs12-der /certs/output.pkcs12 volumes: - - ./certs/output.pkcs12:/certs/output.pkcs12 + - ./certs/output.pkcs12:/certs/output.pkcs12 diff --git a/examples/win32-front-proxy/docker-compose.yaml b/examples/win32-front-proxy/docker-compose.yaml index 71ea7751d01c..5c5b31adeb32 100644 --- a/examples/win32-front-proxy/docker-compose.yaml +++ b/examples/win32-front-proxy/docker-compose.yaml @@ -6,29 +6,29 @@ services: context: . dockerfile: Dockerfile-frontenvoy networks: - - envoymesh + - envoymesh ports: - - "8080:8080" - - "8443:8443" - - "8003:8003" + - "8080:8080" + - "8443:8443" + - "8003:8003" service1: build: context: . dockerfile: Dockerfile-service networks: - - envoymesh + - envoymesh environment: - - SERVICE_NAME=1 + - SERVICE_NAME=1 service2: build: context: . dockerfile: Dockerfile-service networks: - - envoymesh + - envoymesh environment: - - SERVICE_NAME=2 + - SERVICE_NAME=2 networks: envoymesh: {} diff --git a/examples/win32-front-proxy/front-envoy.yaml b/examples/win32-front-proxy/front-envoy.yaml index d96a5d31538c..2cc1c547bef8 100644 --- a/examples/win32-front-proxy/front-envoy.yaml +++ b/examples/win32-front-proxy/front-envoy.yaml @@ -158,10 +158,10 @@ admin: port_value: 8001 layered_runtime: layers: - - name: static_layer_0 - static_layer: - envoy: - resource_limits: - listener: - example_listener_name: - connection_limit: 10000 + - name: static_layer_0 + static_layer: + envoy: + resource_limits: + listener: + example_listener_name: + connection_limit: 10000 diff --git a/examples/zipkin-tracing/docker-compose.yaml b/examples/zipkin-tracing/docker-compose.yaml index 6f0e7542186e..443a4377070e 100644 --- a/examples/zipkin-tracing/docker-compose.yaml +++ b/examples/zipkin-tracing/docker-compose.yaml @@ -6,44 +6,44 @@ services: context: . dockerfile: Dockerfile-frontenvoy networks: - - envoymesh + - envoymesh ports: - - "8000:8000" + - "8000:8000" service1: build: context: ../front-proxy dockerfile: Dockerfile-service volumes: - - ./service1-envoy-zipkin.yaml:/etc/service-envoy.yaml + - ./service1-envoy-zipkin.yaml:/etc/service-envoy.yaml networks: envoymesh: aliases: - - service1 + - service1 environment: - - SERVICE_NAME=1 + - SERVICE_NAME=1 service2: build: context: ../front-proxy dockerfile: Dockerfile-service volumes: - - ./service2-envoy-zipkin.yaml:/etc/service-envoy.yaml + - ./service2-envoy-zipkin.yaml:/etc/service-envoy.yaml networks: envoymesh: aliases: - - service2 + - service2 environment: - - SERVICE_NAME=2 + - SERVICE_NAME=2 zipkin: image: openzipkin/zipkin networks: envoymesh: aliases: - - zipkin + - zipkin ports: - - "9411:9411" + - "9411:9411" networks: envoymesh: {}