Skip to content

Commit ea8456f

Browse files
authored
[frontend-proxy] Rename frontend proxy service (#1910)
* rename frontend-proxy * rename frontend-proxy
1 parent f135bff commit ea8456f

10 files changed

+15
-13
lines changed

.env

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ FRONTEND_DOCKERFILE=./src/frontend/Dockerfile
8585
FRONTEND_HOST=frontend
8686
ENVOY_PORT=8080
8787
FRONTEND_PROXY_ADDR=frontend-proxy:${ENVOY_PORT}
88-
FRONTEND_PROXY_DOCKERFILE=./src/frontendproxy/Dockerfile
88+
FRONTEND_PROXY_DOCKERFILE=./src/frontend-proxy/Dockerfile
8989

9090
# Image Provider
9191
IMAGE_PROVIDER_HOST=image-provider

.github/workflows/component-build-images.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,8 @@ jobs:
8383
tag_suffix: frontend
8484
context: ./
8585
setup-qemu: true
86-
- file: ./src/frontendproxy/Dockerfile
87-
tag_suffix: frontendproxy
86+
- file: ./src/frontend-proxy/Dockerfile
87+
tag_suffix: frontend-proxy
8888
context: ./
8989
setup-qemu: true
9090
- file: ./src/frontend/Dockerfile.cypress

CHANGELOG.md

+2
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,8 @@ the release.
7070
([#1867](https://github.com/open-telemetry/opentelemetry-demo/pull/1867))
7171
* [chore] remove `SERVICE_` from environment variables
7272
([#1897](https://github.com/open-telemetry/opentelemetry-demo/pull/1897))
73+
* [frontend-proxy] rename frontendproxy to frontend-proxy
74+
([#1910](https://github.com/open-telemetry/opentelemetry-demo/pull/1910))
7375

7476
## 1.12.0
7577

docker-compose.minimal.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -242,8 +242,8 @@ services:
242242
logging: *logging
243243

244244
# Frontend Proxy (Envoy)
245-
frontendproxy:
246-
image: ${IMAGE_NAME}:${DEMO_VERSION}-frontendproxy
245+
frontend-proxy:
246+
image: ${IMAGE_NAME}:${DEMO_VERSION}-frontend-proxy
247247
container_name: frontend-proxy
248248
build:
249249
context: ./

docker-compose.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -316,8 +316,8 @@ services:
316316
logging: *logging
317317

318318
# Frontend Proxy (Envoy)
319-
frontendproxy:
320-
image: ${IMAGE_NAME}:${DEMO_VERSION}-frontendproxy
319+
frontend-proxy:
320+
image: ${IMAGE_NAME}:${DEMO_VERSION}-frontend-proxy
321321
container_name: frontend-proxy
322322
build:
323323
context: ./

renovate.json5

+2-2
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@
5151
"groupName": "frontend",
5252
},
5353
{
54-
"matchFileNames": ["src/frontendproxy/**"],
55-
"groupName": "frontendproxy",
54+
"matchFileNames": ["src/frontend-proxy/**"],
55+
"groupName": "frontend-proxy",
5656
},
5757
{
5858
"matchFileNames": ["src/grafana/**"],

src/frontendproxy/Dockerfile src/frontend-proxy/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ RUN apt-get update && apt-get install -y gettext-base && apt-get clean && rm -rf
66

77
USER envoy
88
WORKDIR /home/envoy
9-
COPY ./src/frontendproxy/envoy.tmpl.yaml envoy.tmpl.yaml
9+
COPY ./src/frontend-proxy/envoy.tmpl.yaml envoy.tmpl.yaml
1010

1111
ENTRYPOINT ["/bin/sh", "-c", "envsubst < envoy.tmpl.yaml > envoy.yaml && envoy -c envoy.yaml;"]
File renamed without changes.
File renamed without changes.

src/otel-collector/otelcol-config.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ receivers:
1212
allowed_origins:
1313
- "http://*"
1414
- "https://*"
15-
httpcheck/frontendproxy:
15+
httpcheck/frontend-proxy:
1616
targets:
17-
- endpoint: http://frontendproxy:${env:ENVOY_PORT}
17+
- endpoint: http://frontend-proxy:${env:ENVOY_PORT}
1818
docker_stats:
1919
endpoint: unix:///var/run/docker.sock
2020
redis:
@@ -126,7 +126,7 @@ service:
126126
processors: [transform, batch]
127127
exporters: [otlp, debug, spanmetrics]
128128
metrics:
129-
receivers: [hostmetrics, docker_stats, httpcheck/frontendproxy, otlp, prometheus, redis, spanmetrics]
129+
receivers: [hostmetrics, docker_stats, httpcheck/frontend-proxy, otlp, prometheus, redis, spanmetrics]
130130
processors: [batch]
131131
exporters: [otlphttp/prometheus, debug]
132132
logs:

0 commit comments

Comments
 (0)