From c34398b150a4123bc3d0874dcb449793f895be65 Mon Sep 17 00:00:00 2001 From: Pierre Tessier Date: Fri, 21 Oct 2022 21:52:52 -0400 Subject: [PATCH 1/6] top button goes to /feature --- docker-compose.yml | 7 ++----- src/frontendProxy/Dockerfile | 2 -- src/frontendproxy/Dockerfile | 6 ++++++ src/{frontendProxy => frontendproxy}/envoy.yaml.tmpl | 0 4 files changed, 8 insertions(+), 7 deletions(-) delete mode 100644 src/frontendProxy/Dockerfile create mode 100644 src/frontendproxy/Dockerfile rename src/{frontendProxy => frontendproxy}/envoy.yaml.tmpl (100%) diff --git a/docker-compose.yml b/docker-compose.yml index 1df265416a..849f7279ef 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -211,13 +211,11 @@ services: logging: *logging frontendproxy: - image: ${IMAGE_NAME}:${IMAGE_VERSION}-frontend-envoy + image: ${IMAGE_NAME}:${IMAGE_VERSION}-frontendproxy build: context: ./ - dockerfile: ./src/frontendProxy/Dockerfile + dockerfile: src/frontendproxy/Dockerfile container_name: frontend-proxy - volumes: - - ./src/frontendproxy/envoy.yaml.tmpl:/etc/envoy/envoy.yaml.tmpl ports: - "${ENVOY_PORT}:${ENVOY_PORT}" environment: @@ -230,7 +228,6 @@ services: - ENVOY_UID=0 depends_on: - frontend - command: /bin/sh -c "envsubst < /etc/envoy/envoy.yaml.tmpl > /etc/envoy/envoy.yaml && envoy -c /etc/envoy/envoy.yaml;" loadgenerator: image: ${IMAGE_NAME}:${IMAGE_VERSION}-loadgenerator diff --git a/src/frontendProxy/Dockerfile b/src/frontendProxy/Dockerfile deleted file mode 100644 index 4cc4de7815..0000000000 --- a/src/frontendProxy/Dockerfile +++ /dev/null @@ -1,2 +0,0 @@ -FROM envoyproxy/envoy-dev:8c202194ac6a2cb781eb6ce27d924b379b1e787f -RUN apt-get update && apt-get install -y gettext-base && apt-get clean && rm -rf /var/lib/apt/lists/* diff --git a/src/frontendproxy/Dockerfile b/src/frontendproxy/Dockerfile new file mode 100644 index 0000000000..d30790cfba --- /dev/null +++ b/src/frontendproxy/Dockerfile @@ -0,0 +1,6 @@ +FROM envoyproxy/envoy-dev:8c202194ac6a2cb781eb6ce27d924b379b1e787f +RUN apt-get update && apt-get install -y gettext-base && apt-get clean && rm -rf /var/lib/apt/lists/* + +COPY ./src/frontendproxy/envoy.yaml.tmpl /etc/envoy/envoy.yaml.tmpl + +ENTRYPOINT ["/bin/sh", "-c", "envsubst < /etc/envoy/envoy.yaml.tmpl > /etc/envoy/envoy.yaml && envoy -c /etc/envoy/envoy.yaml;"] diff --git a/src/frontendProxy/envoy.yaml.tmpl b/src/frontendproxy/envoy.yaml.tmpl similarity index 100% rename from src/frontendProxy/envoy.yaml.tmpl rename to src/frontendproxy/envoy.yaml.tmpl From 40c9d00dd4fa97d00689ed09cefc994cd6f54dac Mon Sep 17 00:00:00 2001 From: Pierre Tessier Date: Fri, 21 Oct 2022 23:02:38 -0400 Subject: [PATCH 2/6] package frontendproxy image --- .env | 2 +- docker-compose.yml | 1 - src/frontendproxy/Dockerfile | 4 ++-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.env b/.env index 77dc958a54..ba96101280 100644 --- a/.env +++ b/.env @@ -17,7 +17,7 @@ FRONTEND_ADDR=frontend:${FRONTEND_PORT} # Envoy FRONTEND_HOST=frontend -ENVOY_PORT=80 +ENVOY_PORT=8080 # Redis REDIS_PORT=6379 diff --git a/docker-compose.yml b/docker-compose.yml index a9b2ca52bb..734efadad6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -238,7 +238,6 @@ services: - featureflagservice - loadgenerator - grafana - command: /bin/sh -c "envsubst < /etc/envoy/envoy.tmpl.yaml > /etc/envoy/envoy.yaml && envoy -c /etc/envoy/envoy.yaml;" loadgenerator: image: ${IMAGE_NAME}:${IMAGE_VERSION}-loadgenerator diff --git a/src/frontendproxy/Dockerfile b/src/frontendproxy/Dockerfile index d30790cfba..21b2796004 100644 --- a/src/frontendproxy/Dockerfile +++ b/src/frontendproxy/Dockerfile @@ -1,6 +1,6 @@ FROM envoyproxy/envoy-dev:8c202194ac6a2cb781eb6ce27d924b379b1e787f RUN apt-get update && apt-get install -y gettext-base && apt-get clean && rm -rf /var/lib/apt/lists/* -COPY ./src/frontendproxy/envoy.yaml.tmpl /etc/envoy/envoy.yaml.tmpl +COPY ./src/frontendproxy/envoy.tmpl.yaml /etc/envoy/envoy.tmpl.yaml -ENTRYPOINT ["/bin/sh", "-c", "envsubst < /etc/envoy/envoy.yaml.tmpl > /etc/envoy/envoy.yaml && envoy -c /etc/envoy/envoy.yaml;"] +ENTRYPOINT ["/bin/sh", "-c", "envsubst < /etc/envoy/envoy.tmpl.yaml > /etc/envoy/envoy.yaml && envoy -c /etc/envoy/envoy.yaml;"] From b847a9c8d347322113652b6fe98b0976176436ca Mon Sep 17 00:00:00 2001 From: Pierre Tessier Date: Fri, 21 Oct 2022 23:04:19 -0400 Subject: [PATCH 3/6] set frontendproxy port to 8080 --- .github/.mlc_config.json | 6 +----- docs/docker_deployment.md | 10 +++++----- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/.github/.mlc_config.json b/.github/.mlc_config.json index c2ff8d8545..943c07594d 100644 --- a/.github/.mlc_config.json +++ b/.github/.mlc_config.json @@ -1,10 +1,6 @@ { "ignorePatterns": [ - {"pattern": "^http://localhost"}, - {"pattern": "^http://localhost:3000"}, - {"pattern": "^http://localhost:8089"}, - {"pattern": "^http://localhost:9090"}, - {"pattern": "^http://localhost:16686"}, + {"pattern": "^http://localhost:8080"}, {"pattern": "^https://calendar.google.com/calendar"} ], "replacementPatterns": [ diff --git a/docs/docker_deployment.md b/docs/docker_deployment.md index 362751a1c4..4abfca99e0 100644 --- a/docs/docker_deployment.md +++ b/docs/docker_deployment.md @@ -39,11 +39,11 @@ source. It may take more than 20 minutes to build if the flag is omitted. Once the images are built and containers are started you can access: -- Webstore: -- Grafana: -- Feature Flags UI: -- Load Generator UI: -- Jaeger UI: +- Webstore: +- Grafana: +- Feature Flags UI: +- Load Generator UI: +- Jaeger UI: ## Bring your own backend From 6ef3f895aa8de9f78029aff8369be49a736cd309 Mon Sep 17 00:00:00 2001 From: Pierre Tessier Date: Fri, 21 Oct 2022 23:10:47 -0400 Subject: [PATCH 4/6] use proxy url instead --- docs/feature_flags.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/feature_flags.md b/docs/feature_flags.md index 2d5545c55d..a72b45d9b9 100644 --- a/docs/feature_flags.md +++ b/docs/feature_flags.md @@ -2,7 +2,7 @@ This demo comes with several feature flags which can control failure conditions in specific services. By default the flags are disabled. Using the Feature Flags -UI you will be able to control the status of these +UI you will be able to control the status of these feature flags. | Feature Flag | Service(s) | Description | From c763c8a1681e97df3e02e1309b1d9e8193b165b5 Mon Sep 17 00:00:00 2001 From: Pierre Tessier Date: Fri, 21 Oct 2022 23:11:01 -0400 Subject: [PATCH 5/6] use proxy url instead --- docs/feature_flags.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/feature_flags.md b/docs/feature_flags.md index a72b45d9b9..2c64761144 100644 --- a/docs/feature_flags.md +++ b/docs/feature_flags.md @@ -2,7 +2,7 @@ This demo comes with several feature flags which can control failure conditions in specific services. By default the flags are disabled. Using the Feature Flags -UI you will be able to control the status of these +UI you will be able to control the status of these feature flags. | Feature Flag | Service(s) | Description | From 41e027621ceec8966f10d215dac0b61f7f7c5347 Mon Sep 17 00:00:00 2001 From: Pierre Tessier Date: Fri, 21 Oct 2022 23:15:12 -0400 Subject: [PATCH 6/6] use proxy url instead --- CONTRIBUTING.md | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 50c2e4176a..c611b775b4 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -91,12 +91,11 @@ docker compose up -d Once the images are built and containers are started you can access: -- Webstore: -- Jaeger: -- Prometheus: -- Grafana: -- Feature Flags UI: -- Load Generator UI: +- Webstore: +- Jaeger: +- Grafana: +- Feature Flags UI: +- Load Generator UI: ## Create Your First Pull Request