diff --git a/examples/cache/Dockerfile-service b/examples/cache/Dockerfile-service index 9cb60da727aea..a05db06f5e243 100644 --- a/examples/cache/Dockerfile-service +++ b/examples/cache/Dockerfile-service @@ -1,10 +1,7 @@ -FROM envoyproxy/envoy-alpine-dev:latest +FROM alpine:latest -RUN apk update && apk add py3-pip bash curl -RUN pip3 install -q Flask==0.11.1 requests==2.18.4 pyyaml +RUN apk update && apk add py3-pip +RUN pip3 install -q Flask==0.11.1 pyyaml RUN mkdir /code -COPY ./start_service.sh /usr/local/bin/start_service.sh -COPY ./service-envoy.yaml /etc/service-envoy.yaml COPY ./service.py /code -RUN chmod u+x /usr/local/bin/start_service.sh -ENTRYPOINT /usr/local/bin/start_service.sh +CMD ["python3", "/code/service.py"] diff --git a/examples/cache/docker-compose.yaml b/examples/cache/docker-compose.yaml index 058cf203b3f48..98619eba73ce5 100644 --- a/examples/cache/docker-compose.yaml +++ b/examples/cache/docker-compose.yaml @@ -5,8 +5,6 @@ services: build: context: . dockerfile: Dockerfile-frontenvoy - networks: - - envoymesh ports: - "8000:8000" @@ -16,8 +14,6 @@ services: dockerfile: Dockerfile-service volumes: - ./responses.yaml:/etc/responses.yaml - networks: - - envoymesh environment: - SERVICE_NAME=1 @@ -27,10 +23,5 @@ services: dockerfile: Dockerfile-service volumes: - ./responses.yaml:/etc/responses.yaml - networks: - - envoymesh environment: - SERVICE_NAME=2 - -networks: - envoymesh: {} diff --git a/examples/cache/service-envoy.yaml b/examples/cache/service-envoy.yaml deleted file mode 100644 index eaa849dd40797..0000000000000 --- a/examples/cache/service-envoy.yaml +++ /dev/null @@ -1,45 +0,0 @@ -static_resources: - listeners: - - address: - socket_address: - address: 0.0.0.0 - port_value: 8000 - filter_chains: - - filters: - - name: envoy.filters.network.http_connection_manager - typed_config: - "@type": type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager - codec_type: AUTO - stat_prefix: ingress_http - route_config: - name: local_route - virtual_hosts: - - name: service - domains: - - "*" - routes: - - match: - prefix: "/service" - route: - cluster: local_service - http_filters: - - name: envoy.filters.http.router - typed_config: {} - clusters: - - name: local_service - type: STRICT_DNS - lb_policy: ROUND_ROBIN - load_assignment: - cluster_name: local_service - endpoints: - - lb_endpoints: - - endpoint: - address: - socket_address: - address: 127.0.0.1 - port_value: 8080 -admin: - address: - socket_address: - address: 0.0.0.0 - port_value: 8081 diff --git a/examples/cache/service.py b/examples/cache/service.py index 4433bc4e3c24c..846220b78417a 100644 --- a/examples/cache/service.py +++ b/examples/cache/service.py @@ -3,9 +3,6 @@ from flask import make_response, abort import yaml import os -import requests -import socket -import sys import datetime app = Flask(__name__) @@ -13,7 +10,7 @@ @app.route('/service//') def get(service_number, response_id): - stored_response = yaml.load(open('/etc/responses.yaml', 'r')).get(response_id) + stored_response = yaml.safe_load(open('/etc/responses.yaml', 'r')).get(response_id) if stored_response is None: abort(404, 'No response found with the given id') @@ -41,4 +38,4 @@ def get(service_number, response_id): if not os.path.isfile('/etc/responses.yaml'): print('Responses file not found at /etc/responses.yaml') exit(1) - app.run(host='127.0.0.1', port=8080, debug=True) + app.run(host='0.0.0.0', port=8000, debug=True) diff --git a/examples/cache/start_service.sh b/examples/cache/start_service.sh deleted file mode 100644 index 43a8c112e6362..0000000000000 --- a/examples/cache/start_service.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -python3 /code/service.py & -envoy -c /etc/service-envoy.yaml --service-cluster "service${SERVICE_NAME}" diff --git a/examples/cors/backend/Dockerfile-service b/examples/cors/backend/Dockerfile-service index 0583e9c5846aa..4b98a80704dc7 100644 --- a/examples/cors/backend/Dockerfile-service +++ b/examples/cors/backend/Dockerfile-service @@ -1,9 +1,8 @@ -FROM envoyproxy/envoy-alpine-dev:latest +FROM alpine:latest -RUN apk update && apk add py3-pip bash +RUN apk update && apk add py3-pip RUN pip3 install -q Flask==0.11.1 RUN mkdir /code ADD ./service.py /code/ -ADD ./start_service.sh /usr/local/bin/start_service.sh -RUN chmod u+x /usr/local/bin/start_service.sh -ENTRYPOINT ["/bin/sh", "/usr/local/bin/start_service.sh"] + +CMD ["python3", "/code/service.py"] diff --git a/examples/cors/backend/docker-compose.yaml b/examples/cors/backend/docker-compose.yaml index 175fe6f677869..ae64b59026c3b 100644 --- a/examples/cors/backend/docker-compose.yaml +++ b/examples/cors/backend/docker-compose.yaml @@ -5,8 +5,6 @@ services: build: context: . dockerfile: Dockerfile-frontenvoy - networks: - - envoymesh ports: - "8002:8000" - "8003:8001" @@ -15,12 +13,3 @@ services: build: context: . dockerfile: Dockerfile-service - volumes: - - ./service-envoy.yaml:/etc/service-envoy.yaml - networks: - envoymesh: - aliases: - - backendservice - -networks: - envoymesh: {} diff --git a/examples/cors/backend/front-envoy.yaml b/examples/cors/backend/front-envoy.yaml index cd95621758d0f..2c64fad1e09ed 100644 --- a/examples/cors/backend/front-envoy.yaml +++ b/examples/cors/backend/front-envoy.yaml @@ -81,7 +81,7 @@ static_resources: - endpoint: address: socket_address: - address: backendservice + address: backend-service port_value: 8000 admin: diff --git a/examples/cors/backend/service-envoy.yaml b/examples/cors/backend/service-envoy.yaml deleted file mode 100644 index d5943d46ea7ba..0000000000000 --- a/examples/cors/backend/service-envoy.yaml +++ /dev/null @@ -1,45 +0,0 @@ -static_resources: - listeners: - - address: - socket_address: - address: 0.0.0.0 - port_value: 8000 - filter_chains: - - filters: - - name: envoy.filters.network.http_connection_manager - typed_config: - "@type": type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager - codec_type: AUTO - stat_prefix: ingress_http - route_config: - name: local_route - virtual_hosts: - - name: service - domains: - - "*" - routes: - - match: - prefix: "/" - route: - cluster: local_service - http_filters: - - name: envoy.filters.http.router - typed_config: {} - clusters: - - name: local_service - type: STRICT_DNS - lb_policy: ROUND_ROBIN - load_assignment: - cluster_name: local_service - endpoints: - - lb_endpoints: - - endpoint: - address: - socket_address: - address: 127.0.0.1 - port_value: 8080 -admin: - address: - socket_address: - address: 0.0.0.0 - port_value: 8081 diff --git a/examples/cors/backend/service.py b/examples/cors/backend/service.py index 23641d79c4023..d212ac7a014cf 100644 --- a/examples/cors/backend/service.py +++ b/examples/cors/backend/service.py @@ -1,5 +1,4 @@ -from flask import Flask, request, send_from_directory -import os +from flask import Flask app = Flask(__name__) @@ -10,4 +9,4 @@ def cors_enabled(status): if __name__ == "__main__": - app.run(host='127.0.0.1', port=8080, debug=True) + app.run(host='0.0.0.0', port=8000) diff --git a/examples/cors/backend/start_service.sh b/examples/cors/backend/start_service.sh deleted file mode 100644 index 832148bd74c1c..0000000000000 --- a/examples/cors/backend/start_service.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -python3 /code/service.py & -envoy -c /etc/service-envoy.yaml --service-cluster backend-service diff --git a/examples/cors/frontend/Dockerfile-service b/examples/cors/frontend/Dockerfile-service index 31da7f6febf3d..85dba2382f99e 100644 --- a/examples/cors/frontend/Dockerfile-service +++ b/examples/cors/frontend/Dockerfile-service @@ -1,9 +1,8 @@ -FROM envoyproxy/envoy-alpine-dev:latest +FROM alpine:latest -RUN apk update && apk add py3-pip bash +RUN apk update && apk add py3-pip RUN pip3 install -q Flask==0.11.1 RUN mkdir /code ADD ./service.py ./index.html /code/ -ADD ./start_service.sh /usr/local/bin/start_service.sh -RUN chmod u+x /usr/local/bin/start_service.sh -ENTRYPOINT ["/bin/sh", "/usr/local/bin/start_service.sh"] + +CMD ["python3", "/code/service.py"] diff --git a/examples/cors/frontend/docker-compose.yaml b/examples/cors/frontend/docker-compose.yaml index d0aeffaf8e4da..9ed7c014c322e 100644 --- a/examples/cors/frontend/docker-compose.yaml +++ b/examples/cors/frontend/docker-compose.yaml @@ -5,8 +5,6 @@ services: build: context: . dockerfile: Dockerfile-frontenvoy - networks: - - envoymesh ports: - "8000:8000" @@ -14,12 +12,3 @@ services: build: context: . dockerfile: Dockerfile-service - volumes: - - ./service-envoy.yaml:/etc/service-envoy.yaml - networks: - envoymesh: - aliases: - - frontendservice - -networks: - envoymesh: {} diff --git a/examples/cors/frontend/front-envoy.yaml b/examples/cors/frontend/front-envoy.yaml index 51411fafa9234..51318fb26243b 100644 --- a/examples/cors/frontend/front-envoy.yaml +++ b/examples/cors/frontend/front-envoy.yaml @@ -42,5 +42,5 @@ static_resources: - endpoint: address: socket_address: - address: frontendservice + address: frontend-service port_value: 8000 diff --git a/examples/cors/frontend/service-envoy.yaml b/examples/cors/frontend/service-envoy.yaml deleted file mode 100644 index d5943d46ea7ba..0000000000000 --- a/examples/cors/frontend/service-envoy.yaml +++ /dev/null @@ -1,45 +0,0 @@ -static_resources: - listeners: - - address: - socket_address: - address: 0.0.0.0 - port_value: 8000 - filter_chains: - - filters: - - name: envoy.filters.network.http_connection_manager - typed_config: - "@type": type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager - codec_type: AUTO - stat_prefix: ingress_http - route_config: - name: local_route - virtual_hosts: - - name: service - domains: - - "*" - routes: - - match: - prefix: "/" - route: - cluster: local_service - http_filters: - - name: envoy.filters.http.router - typed_config: {} - clusters: - - name: local_service - type: STRICT_DNS - lb_policy: ROUND_ROBIN - load_assignment: - cluster_name: local_service - endpoints: - - lb_endpoints: - - endpoint: - address: - socket_address: - address: 127.0.0.1 - port_value: 8080 -admin: - address: - socket_address: - address: 0.0.0.0 - port_value: 8081 diff --git a/examples/cors/frontend/service.py b/examples/cors/frontend/service.py index 5db220ed34bf6..3ab663fcdc483 100644 --- a/examples/cors/frontend/service.py +++ b/examples/cors/frontend/service.py @@ -11,4 +11,4 @@ def index(): if __name__ == "__main__": - app.run(host='127.0.0.1', port=8080, debug=True) + app.run(host='0.0.0.0', port=8000, debug=True) diff --git a/examples/cors/frontend/start_service.sh b/examples/cors/frontend/start_service.sh deleted file mode 100644 index 982bd079e17b7..0000000000000 --- a/examples/cors/frontend/start_service.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -python3 /code/service.py & -envoy -c /etc/service-envoy.yaml --service-cluster frontend-service diff --git a/examples/csrf/crosssite/Dockerfile-service b/examples/csrf/crosssite/Dockerfile-service index ed8cdfdfb5803..873f00e042460 100644 --- a/examples/csrf/crosssite/Dockerfile-service +++ b/examples/csrf/crosssite/Dockerfile-service @@ -1,9 +1,7 @@ -FROM envoyproxy/envoy-alpine-dev:latest +FROM alpine:latest -RUN apk update && apk add py3-pip bash +RUN apk update && apk add py3-pip RUN pip3 install -q Flask==0.11.1 RUN mkdir /code ADD ./crosssite/service.py ./index.html /code/ -ADD ./start_service.sh /usr/local/bin/start_service.sh -RUN chmod u+x /usr/local/bin/start_service.sh -ENTRYPOINT ["/bin/sh", "/usr/local/bin/start_service.sh"] +CMD ["python3", "/code/service.py"] diff --git a/examples/csrf/crosssite/docker-compose.yml b/examples/csrf/crosssite/docker-compose.yml index e2329906e1b32..bc6e93e22f715 100644 --- a/examples/csrf/crosssite/docker-compose.yml +++ b/examples/csrf/crosssite/docker-compose.yml @@ -5,8 +5,6 @@ services: build: context: . dockerfile: Dockerfile-frontenvoy - networks: - - envoymesh ports: - "8002:8000" @@ -14,10 +12,3 @@ services: build: context: .. dockerfile: crosssite/Dockerfile-service - volumes: - - ../service-envoy.yaml:/etc/service-envoy.yaml - networks: - - envoymesh - -networks: - envoymesh: {} diff --git a/examples/csrf/crosssite/service.py b/examples/csrf/crosssite/service.py index 10b71e0e6e471..bac49e2a10bb3 100644 --- a/examples/csrf/crosssite/service.py +++ b/examples/csrf/crosssite/service.py @@ -13,4 +13,4 @@ def index(): if __name__ == "__main__": - app.run(host='127.0.0.1', port=8080, debug=True) + app.run(host='0.0.0.0', port=8000) diff --git a/examples/csrf/samesite/Dockerfile-service b/examples/csrf/samesite/Dockerfile-service index 3a78e72af04e8..17fd1f51a6dca 100644 --- a/examples/csrf/samesite/Dockerfile-service +++ b/examples/csrf/samesite/Dockerfile-service @@ -1,9 +1,7 @@ -FROM envoyproxy/envoy-alpine-dev:latest +FROM alpine:latest -RUN apk update && apk add py3-pip bash +RUN apk update && apk add py3-pip RUN pip3 install -q Flask==0.11.1 RUN mkdir /code ADD ./samesite/service.py ./index.html /code/ -ADD ./start_service.sh /usr/local/bin/start_service.sh -RUN chmod u+x /usr/local/bin/start_service.sh -ENTRYPOINT ["/bin/sh", "/usr/local/bin/start_service.sh"] +CMD ["python3", "/code/service.py"] diff --git a/examples/csrf/samesite/docker-compose.yml b/examples/csrf/samesite/docker-compose.yml index 9a80918bd1677..0f7a92d16186a 100644 --- a/examples/csrf/samesite/docker-compose.yml +++ b/examples/csrf/samesite/docker-compose.yml @@ -5,8 +5,6 @@ services: build: context: . dockerfile: Dockerfile-frontenvoy - networks: - - envoymesh ports: - "8000:8000" - "8001:8001" @@ -15,10 +13,3 @@ services: build: context: .. dockerfile: samesite/Dockerfile-service - volumes: - - ../service-envoy.yaml:/etc/service-envoy.yaml - networks: - - envoymesh - -networks: - envoymesh: {} diff --git a/examples/csrf/samesite/service.py b/examples/csrf/samesite/service.py index 3d54346532afb..0fd88193a7bbd 100644 --- a/examples/csrf/samesite/service.py +++ b/examples/csrf/samesite/service.py @@ -23,4 +23,4 @@ def index(): if __name__ == "__main__": - app.run(host='127.0.0.1', port=8080, debug=True) + app.run(host='0.0.0.0', port=8000) diff --git a/examples/csrf/service-envoy.yaml b/examples/csrf/service-envoy.yaml deleted file mode 100644 index d5943d46ea7ba..0000000000000 --- a/examples/csrf/service-envoy.yaml +++ /dev/null @@ -1,45 +0,0 @@ -static_resources: - listeners: - - address: - socket_address: - address: 0.0.0.0 - port_value: 8000 - filter_chains: - - filters: - - name: envoy.filters.network.http_connection_manager - typed_config: - "@type": type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager - codec_type: AUTO - stat_prefix: ingress_http - route_config: - name: local_route - virtual_hosts: - - name: service - domains: - - "*" - routes: - - match: - prefix: "/" - route: - cluster: local_service - http_filters: - - name: envoy.filters.http.router - typed_config: {} - clusters: - - name: local_service - type: STRICT_DNS - lb_policy: ROUND_ROBIN - load_assignment: - cluster_name: local_service - endpoints: - - lb_endpoints: - - endpoint: - address: - socket_address: - address: 127.0.0.1 - port_value: 8080 -admin: - address: - socket_address: - address: 0.0.0.0 - port_value: 8081 diff --git a/examples/load-reporting-service/Dockerfile-envoy b/examples/load-reporting-service/Dockerfile-envoy new file mode 100644 index 0000000000000..ac31ed9e017c3 --- /dev/null +++ b/examples/load-reporting-service/Dockerfile-envoy @@ -0,0 +1,6 @@ +FROM envoyproxy/envoy-dev:latest + +COPY ./service-envoy-w-lrs.yaml /etc/service-envoy-w-lrs.yaml +RUN chmod go+r /etc/service-envoy-w-lrs.yaml + +CMD ["/usr/local/bin/envoy", "-c", "/etc/service-envoy-w-lrs.yaml", "--service-node", "${HOSTNAME}", "--service-cluster", "http_service"] diff --git a/examples/load-reporting-service/Dockerfile-http-server b/examples/load-reporting-service/Dockerfile-http-server index e71aa6b754686..a63927fbd8046 100644 --- a/examples/load-reporting-service/Dockerfile-http-server +++ b/examples/load-reporting-service/Dockerfile-http-server @@ -1,11 +1,8 @@ -FROM envoyproxy/envoy-alpine-dev:latest - -RUN apk update && apk add py3-pip bash curl -RUN mkdir /code -ADD ./start_service.sh /usr/local/bin/start_service.sh -COPY . ./code +FROM alpine:latest +RUN apk update && apk add py3-pip RUN pip3 install -q Flask==0.11.1 +RUN mkdir /code +COPY ./service.py ./code -RUN chmod u+x /usr/local/bin/start_service.sh -ENTRYPOINT ["/bin/sh", "/usr/local/bin/start_service.sh"] +CMD ["python3", "/code/service.py"] diff --git a/examples/load-reporting-service/docker-compose.yaml b/examples/load-reporting-service/docker-compose.yaml index a5182e2b6de24..3582e8744c689 100644 --- a/examples/load-reporting-service/docker-compose.yaml +++ b/examples/load-reporting-service/docker-compose.yaml @@ -1,29 +1,23 @@ version: '3.7' services: - http_service: + envoy: build: context: . - dockerfile: Dockerfile-http-server - volumes: - - ./service-envoy-w-lrs.yaml:/etc/service-envoy-w-lrs.yaml - environment: - ENVOY_UID: 0 - networks: - - envoymesh + dockerfile: Dockerfile-envoy ports: - "80-81:80" + http_service: + build: + context: . + dockerfile: Dockerfile-http-server + lrs_server: build: context: . dockerfile: Dockerfile-lrs - networks: - - envoymesh volumes: - /go/src/github.com/envoyproxy/envoy/examples/load-reporting-service ports: - "18000:18000" - -networks: - envoymesh: {} diff --git a/examples/load-reporting-service/service-envoy-w-lrs.yaml b/examples/load-reporting-service/service-envoy-w-lrs.yaml index c5da0d64a1651..8c40861470bca 100644 --- a/examples/load-reporting-service/service-envoy-w-lrs.yaml +++ b/examples/load-reporting-service/service-envoy-w-lrs.yaml @@ -36,7 +36,7 @@ static_resources: - endpoint: address: socket_address: - address: 127.0.0.1 + address: http_service port_value: 8082 - name: load_reporting_cluster type: STRICT_DNS diff --git a/examples/load-reporting-service/http_server.py b/examples/load-reporting-service/service.py similarity index 100% rename from examples/load-reporting-service/http_server.py rename to examples/load-reporting-service/service.py diff --git a/examples/load-reporting-service/start_service.sh b/examples/load-reporting-service/start_service.sh deleted file mode 100644 index 3fa5d85f7a371..0000000000000 --- a/examples/load-reporting-service/start_service.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -python3 /code/http_server.py & -/usr/local/bin/envoy -c /etc/service-envoy-w-lrs.yaml --service-node "${HOSTNAME}" --service-cluster http_service