Skip to content

Commit

Permalink
yaml: Lint example configs (envoyproxy#16841)
Browse files Browse the repository at this point in the history
Signed-off-by: Ryan Northey <[email protected]>
  • Loading branch information
phlax authored Jun 8, 2021
1 parent 8e02e70 commit 233546f
Show file tree
Hide file tree
Showing 43 changed files with 217 additions and 217 deletions.
10 changes: 5 additions & 5 deletions examples/cache/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions examples/cors/backend/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ services:
context: .
dockerfile: Dockerfile-frontenvoy
ports:
- "8002:8000"
- "8003:8001"
- "8002:8000"
- "8003:8001"

backend-service:
build:
Expand Down
6 changes: 3 additions & 3 deletions examples/cors/backend/front-envoy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion examples/cors/frontend/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ services:
context: .
dockerfile: Dockerfile-frontenvoy
ports:
- "8000:8000"
- "8000:8000"

frontend-service:
build:
Expand Down
6 changes: 3 additions & 3 deletions examples/cors/frontend/front-envoy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion examples/csrf/crosssite/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ services:
context: .
dockerfile: Dockerfile-frontenvoy
ports:
- "8002:8000"
- "8002:8000"

service:
build:
Expand Down
6 changes: 3 additions & 3 deletions examples/csrf/crosssite/front-envoy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions examples/csrf/samesite/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ services:
context: .
dockerfile: Dockerfile-frontenvoy
ports:
- "8000:8000"
- "8001:8001"
- "8000:8000"
- "8001:8001"

service:
build:
Expand Down
6 changes: 3 additions & 3 deletions examples/csrf/samesite/front-envoy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions examples/double-proxy/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ services:
networks:
edge:
ports:
- "10000:10000"
- "10000:10000"

app:
build:
Expand All @@ -25,7 +25,7 @@ services:
networks:
postgres-frontend:
aliases:
- postgres
- postgres
postgres-in-between:

proxy-postgres-backend:
Expand Down
8 changes: 4 additions & 4 deletions examples/dynamic-config-cp/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion examples/ext_authz/config/http-service.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
36 changes: 18 additions & 18 deletions examples/ext_authz/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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: {}
10 changes: 5 additions & 5 deletions examples/fault-injection/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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: {}
20 changes: 10 additions & 10 deletions examples/front-proxy/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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: {}
14 changes: 7 additions & 7 deletions examples/front-proxy/front-envoy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
8 changes: 4 additions & 4 deletions examples/grpc-bridge/docker-compose-protos.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
16 changes: 8 additions & 8 deletions examples/grpc-bridge/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -21,19 +21,19 @@ services:
networks:
envoymesh:
aliases:
- kv-backend-proxy
- kv-backend-proxy
ports:
- "8811:8811"
- "8811:8811"

# Requires the build of the stubs first
grpc-client:
image: envoyproxy/example-kv-client
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:
Expand All @@ -42,9 +42,9 @@ services:
networks:
envoymesh:
aliases:
- kv-client-proxy
- kv-client-proxy
ports:
- "9911:9911"
- "9911:9911"

networks:
envoymesh: {}
6 changes: 3 additions & 3 deletions examples/gzip/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ services:
context: .
dockerfile: Dockerfile-gzip
ports:
- "9901:9901"
- "9902:9902"
- "10000:10000"
- "9901:9901"
- "9902:9902"
- "10000:10000"

service:
build:
Expand Down
Loading

0 comments on commit 233546f

Please sign in to comment.