Skip to content

Commit c41f329

Browse files
YuryHrytsukYuryHrytsuk
committed
Merge remote-tracking branch 'upstream/main' into traefik-fallback-service
2 parents 7553162 + bdc96b6 commit c41f329

9 files changed

+26
-107
lines changed

‎services/traefik/Makefile‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,6 @@ include ${REPO_BASE_DIR}/scripts/common.Makefile
1313
up-local: .init .create_secrets ${TEMP_COMPOSE}-local prune-docker-stack-configs ## Deploys the stack using provided certificates
1414
@docker stack deploy --with-registry-auth --prune --compose-file ${TEMP_COMPOSE}-local ${STACK_NAME}
1515

16-
.PHONY: up-letsencrypt-http
17-
up-letsencrypt-http: .init ${TEMP_COMPOSE}-letsencrypt-http prune-docker-stack-configs ## Deploys the stack with let's encrypt http challenge
18-
@docker stack deploy --with-registry-auth --prune --compose-file ${TEMP_COMPOSE}-letsencrypt-http ${STACK_NAME}
19-
20-
.PHONY: up-letsencrypt-dns
21-
up-letsencrypt-dns: .init ${TEMP_COMPOSE}-letsencrypt-dns prune-docker-stack-configs ## Deploys the stack with let's encrypt dns challenge
22-
@docker stack deploy --with-registry-auth --prune --compose-file ${TEMP_COMPOSE}-dns ${STACK_NAME}
23-
2416
.PHONY: up-dalco
2517
up-dalco: .init ${TEMP_COMPOSE}-dalco prune-docker-stack-configs ## Deploys the stack on dalco cluster
2618
@docker stack deploy --with-registry-auth --prune --compose-file ${TEMP_COMPOSE}-dalco ${STACK_NAME}
@@ -56,20 +48,6 @@ ${TEMP_COMPOSE}-local: docker-compose.yml docker-compose.local.yml .env
5648
set +o allexport; \
5749
${REPO_BASE_DIR}/scripts/docker-stack-config.bash -e .env $< docker-compose.local.yml > $@
5850

59-
.PHONY: ${TEMP_COMPOSE}-letsencrypt-http
60-
${TEMP_COMPOSE}-letsencrypt-http: docker-compose.yml docker-compose.letsencrypt.http.yml .env
61-
@set -o allexport; \
62-
source .env; \
63-
set +o allexport; \
64-
${REPO_BASE_DIR}/scripts/docker-stack-config.bash -e .env $< docker-compose.letsencrypt.http.yml > $@
65-
66-
.PHONY: ${TEMP_COMPOSE}-letsencrypt-dns
67-
${TEMP_COMPOSE}-letsencrypt-dns: docker-compose.yml docker-compose.letsencrypt.dns.yml .env
68-
@set -o allexport; \
69-
source .env; \
70-
set +o allexport; \
71-
${REPO_BASE_DIR}/scripts/docker-stack-config.bash -e .env $< docker-compose.letsencrypt.dns.yml > $@
72-
7351
.PHONY: ${TEMP_COMPOSE}-aws
7452
${TEMP_COMPOSE}-aws: docker-compose.yml docker-compose.aws.yml .env
7553
@set -o allexport; \

‎services/traefik/docker-compose.aws.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1-
version: "3.7"
21
services:
32
traefik:
43
command:
54
- "--api=true"
5+
- "--ping=true"
6+
- "--entryPoints.ping.address=:9082"
7+
- "--ping.entryPoint=ping"
68
- "--api.dashboard=true"
79
- "--log.level=${OPS_TRAEFIK_LOGLEVEL}"
810
- "--accesslog=false"
@@ -15,11 +17,9 @@ services:
1517
- "--entrypoints.http.http.redirections.entrypoint.to=https"
1618
- "--entrypoints.http.http.redirections.entrypoint.scheme=https"
1719
- "--entrypoints.http.http.redirections.entrypoint.permanent=true"
18-
- "--entryPoints.http.transport.respondingTimeouts.idleTimeout=21600s" #6h, for https://github.com/traefik/traefik/issues/10805
1920
- "--entryPoints.http.transport.respondingTimeouts.writeTimeout=21600s" #6h, for https://github.com/traefik/traefik/issues/10805
2021
- "--entryPoints.http.transport.respondingTimeouts.readTimeout=21600s" #6h, for https://github.com/traefik/traefik/issues/10805
2122
- "--entryPoints.https.address=:443"
22-
- "--entryPoints.https.transport.respondingTimeouts.idleTimeout=21600s" #6h, for https://github.com/traefik/traefik/issues/10805
2323
- "--entryPoints.https.transport.respondingTimeouts.writeTimeout=21600s" #6h, for https://github.com/traefik/traefik/issues/10805
2424
- "--entryPoints.https.transport.respondingTimeouts.readTimeout=21600s" #6h, for https://github.com/traefik/traefik/issues/10805
2525
- "--entryPoints.smtp.address=:25"

‎services/traefik/docker-compose.dalco.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1-
version: "3.7"
21
services:
32
traefik:
43
command:
54
- "--api=true"
5+
- "--ping=true"
6+
- "--entryPoints.ping.address=:9082"
7+
- "--ping.entryPoint=ping"
68
- "--api.dashboard=true"
79
- "--log.level=${OPS_TRAEFIK_LOGLEVEL}"
810
- "--accesslog=false"
@@ -15,11 +17,9 @@ services:
1517
- "--entrypoints.http.http.redirections.entrypoint.to=https"
1618
- "--entrypoints.http.http.redirections.entrypoint.scheme=https"
1719
- "--entrypoints.http.http.redirections.entrypoint.permanent=true"
18-
- "--entryPoints.http.transport.respondingTimeouts.idleTimeout=21600s" #6h, for https://github.com/traefik/traefik/issues/10805
1920
- "--entryPoints.http.transport.respondingTimeouts.writeTimeout=21600s" #6h, for https://github.com/traefik/traefik/issues/10805
2021
- "--entryPoints.http.transport.respondingTimeouts.readTimeout=21600s" #6h, for https://github.com/traefik/traefik/issues/10805
2122
- "--entryPoints.https.address=:443"
22-
- "--entryPoints.https.transport.respondingTimeouts.idleTimeout=21600s" #6h, for https://github.com/traefik/traefik/issues/10805
2323
- "--entryPoints.https.transport.respondingTimeouts.writeTimeout=21600s" #6h, for https://github.com/traefik/traefik/issues/10805
2424
- "--entryPoints.https.transport.respondingTimeouts.readTimeout=21600s" #6h, for https://github.com/traefik/traefik/issues/10805
2525
- "--entryPoints.smtp.address=:25"

‎services/traefik/docker-compose.letsencrypt.dns.yml.j2‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎services/traefik/docker-compose.letsencrypt.http.yml‎

Lines changed: 0 additions & 46 deletions
This file was deleted.

‎services/traefik/docker-compose.local.yml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
version: "3.7"
2-
31
services:
42
traefik:
53
command:
@@ -8,6 +6,9 @@ services:
86
- "/bin/sh"
97
- "/customEntrypoint.sh"
108
- "--api=true"
9+
- "--ping=true"
10+
- "--entryPoints.ping.address=:9082"
11+
- "--ping.entryPoint=ping"
1112
- "--api.dashboard=true"
1213
- "--log.level=${OPS_TRAEFIK_LOGLEVEL}"
1314
- "--accesslog=true"
@@ -25,11 +26,9 @@ services:
2526
- "--metrics.prometheus.entryPoint=metrics"
2627
- "--entryPoints.smtp.address=:25"
2728
- "--entryPoints.http.address=:80"
28-
- "--entryPoints.http.transport.respondingTimeouts.idleTimeout=21600s" #6h, for https://github.com/traefik/traefik/issues/10805
2929
- "--entryPoints.http.transport.respondingTimeouts.writeTimeout=21600s" #6h, for https://github.com/traefik/traefik/issues/10805
3030
- "--entryPoints.http.transport.respondingTimeouts.readTimeout=21600s" #6h, for https://github.com/traefik/traefik/issues/10805
3131
- "--entryPoints.https.address=:443"
32-
- "--entryPoints.https.transport.respondingTimeouts.idleTimeout=21600s" #6h, for https://github.com/traefik/traefik/issues/10805
3332
- "--entryPoints.https.transport.respondingTimeouts.writeTimeout=21600s" #6h, for https://github.com/traefik/traefik/issues/10805
3433
- "--entryPoints.https.transport.respondingTimeouts.readTimeout=21600s" #6h, for https://github.com/traefik/traefik/issues/10805
3534
- "--entryPoints.postgres.address=:5432"

‎services/traefik/docker-compose.master.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1-
version: "3.7"
21
services:
32
traefik:
43
command:
54
- "--api=true"
5+
- "--ping=true"
6+
- "--entryPoints.ping.address=:9082"
7+
- "--ping.entryPoint=ping"
68
- "--api.dashboard=true"
79
- "--log.level=${OPS_TRAEFIK_LOGLEVEL}"
810
- "--accesslog=false"
@@ -15,11 +17,9 @@ services:
1517
- "--entrypoints.http.http.redirections.entrypoint.to=https"
1618
- "--entrypoints.http.http.redirections.entrypoint.scheme=https"
1719
- "--entrypoints.http.http.redirections.entrypoint.permanent=true"
18-
- "--entryPoints.http.transport.respondingTimeouts.idleTimeout=21600s" #6h, for https://github.com/traefik/traefik/issues/10805
1920
- "--entryPoints.http.transport.respondingTimeouts.writeTimeout=21600s" #6h, for https://github.com/traefik/traefik/issues/10805
2021
- "--entryPoints.http.transport.respondingTimeouts.readTimeout=21600s" #6h, for https://github.com/traefik/traefik/issues/10805
2122
- "--entryPoints.https.address=:443"
22-
- "--entryPoints.https.transport.respondingTimeouts.idleTimeout=21600s" #6h, for https://github.com/traefik/traefik/issues/10805
2323
- "--entryPoints.https.transport.respondingTimeouts.writeTimeout=21600s" #6h, for https://github.com/traefik/traefik/issues/10805
2424
- "--entryPoints.https.transport.respondingTimeouts.readTimeout=21600s" #6h, for https://github.com/traefik/traefik/issues/10805
2525
- "--entryPoints.postgres.address=:5432"

‎services/traefik/docker-compose.public.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
1-
version: "3.7"
21
services:
32
traefik:
43
dns: 8.8.8.8 # This is critical to make the ACME challange work
54
command:
65
- "--api=true"
6+
- "--ping=true"
7+
- "--entryPoints.ping.address=:9082"
8+
- "--ping.entryPoint=ping"
79
- "--api.dashboard=true"
810
- "--log.level=${OPS_TRAEFIK_LOGLEVEL}"
911
- "--accesslog=false"
@@ -17,11 +19,9 @@ services:
1719
- "--entrypoints.http.http.redirections.entrypoint.to=https"
1820
- "--entrypoints.http.http.redirections.entrypoint.scheme=https"
1921
- "--entrypoints.http.http.redirections.entrypoint.permanent=true"
20-
- "--entryPoints.http.transport.respondingTimeouts.idleTimeout=21600s" #6h, for https://github.com/traefik/traefik/issues/10805
2122
- "--entryPoints.http.transport.respondingTimeouts.writeTimeout=21600s" #6h, for https://github.com/traefik/traefik/issues/10805
2223
- "--entryPoints.http.transport.respondingTimeouts.readTimeout=21600s" #6h, for https://github.com/traefik/traefik/issues/10805
2324
- "--entryPoints.https.address=:443"
24-
- "--entryPoints.https.transport.respondingTimeouts.idleTimeout=21600s" #6h, for https://github.com/traefik/traefik/issues/10805
2525
- "--entryPoints.https.transport.respondingTimeouts.writeTimeout=21600s" #6h, for https://github.com/traefik/traefik/issues/10805
2626
- "--entryPoints.https.transport.respondingTimeouts.readTimeout=21600s" #6h, for https://github.com/traefik/traefik/issues/10805
2727
- "--entryPoints.smtp.address=:25"

‎services/traefik/docker-compose.yml.j2‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
version: "3.7"
2-
31
services:
42
traefik:
53
image: "traefik:v3.4.0"
64
init: true
75
command:
86
- "--api=true"
7+
- "--ping=true"
8+
- "--entryPoints.ping.address=:9082"
9+
- "--ping.entryPoint=ping"
910
- "--api.dashboard=true"
1011
- "--accesslog=true"
1112
- "--accesslog.format=json"
@@ -22,7 +23,6 @@ services:
2223
- "--entryPoints.metrics.address=:8082"
2324
- "--metrics.prometheus.entryPoint=metrics"
2425
- "--entryPoints.http.address=:80"
25-
- "--entryPoints.http.transport.respondingTimeouts.idleTimeout=21600s" #6h, for https://github.com/traefik/traefik/issues/10805
2626
- "--entryPoints.http.transport.respondingTimeouts.writeTimeout=21600s" #6h, for https://github.com/traefik/traefik/issues/10805
2727
- "--entryPoints.http.transport.respondingTimeouts.readTimeout=21600s" #6h, for https://github.com/traefik/traefik/issues/10805
2828
- "--entrypoints.http.http.redirections.entrypoint.to=https"
@@ -31,7 +31,6 @@ services:
3131
- '--entryPoints.postgres.address=:5432'
3232
- '--entryPoints.postgres2.address=:5433'
3333
- "--entryPoints.https.address=:443"
34-
- "--entryPoints.https.transport.respondingTimeouts.idleTimeout=21600s" #6h, for https://github.com/traefik/traefik/issues/10805
3534
- "--entryPoints.https.transport.respondingTimeouts.writeTimeout=21600s" #6h, for https://github.com/traefik/traefik/issues/10805
3635
- "--entryPoints.https.transport.respondingTimeouts.readTimeout=21600s" #6h, for https://github.com/traefik/traefik/issues/10805
3736
- "--providers.swarm.endpoint=unix:///var/run/docker.sock"
@@ -43,6 +42,14 @@ services:
4342
- "--tracing.addinternals"
4443
- "--tracing.otlp=true"
4544
- "--tracing.otlp.http=true"
45+
healthcheck:
46+
# NOTE: this healthcheck to check if traefik is up and running must be run on the ping entrypoint defined in command!
47+
test: traefik healthcheck --ping --ping.entryPoint=ping --entryPoints.ping.address=:9082
48+
interval: 10s
49+
timeout: 5s
50+
retries: 5
51+
start_period: 10s
52+
start_interval: 1s
4653
ports:
4754
- target: 80
4855
published: 80

0 commit comments

Comments
 (0)