Skip to content

Commit faeb5f0

Browse files
authored
upgrade to traefik v3.4 (#1046)
1 parent 1097b67 commit faeb5f0

File tree

13 files changed

+24
-24
lines changed

13 files changed

+24
-24
lines changed

services/admin-panels/docker-compose.yml.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ services:
8787
deploy:
8888
labels:
8989
- traefik.enable=true
90-
- traefik.docker.network=${PUBLIC_NETWORK}
90+
- traefik.swarm.network=${PUBLIC_NETWORK}
9191
- traefik.http.services.adminpanels.loadbalancer.server.port=8888
9292
- traefik.http.routers.adminpanels.rule=Host(`${ADMINPANELS_DOMAIN}`)
9393
- traefik.http.routers.adminpanels.entrypoints=https

services/appmotion_gateway/docker-compose.yml.j2

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ services:
1313
replicas: 0
1414
labels:
1515
- traefik.enable=true
16-
- traefik.docker.network=${PUBLIC_NETWORK}
16+
- traefik.swarm.network=${PUBLIC_NETWORK}
1717
- traefik.http.services.adminer_appmotion_gateway.loadbalancer.server.port=8080
1818
- traefik.http.routers.adminer_appmotion_gateway.rule=Host(`${MONITORING_DOMAIN}`) && PathPrefix(`/adminer/appmotion_gateway`)
1919
- traefik.http.routers.adminer_appmotion_gateway.entrypoints=https
@@ -75,7 +75,7 @@ services:
7575
replicas: 1
7676
labels:
7777
- traefik.enable=true
78-
- traefik.docker.network=${PUBLIC_NETWORK}
78+
- traefik.swarm.network=${PUBLIC_NETWORK}
7979
- traefik.http.routers.appmotion_gateway.rule=${DEPLOYMENT_FQDNS_APPMOTION_CAPTURE_TRAEFIK_RULE}
8080
- traefik.http.routers.appmotion_gateway.entrypoints=https
8181
- traefik.http.routers.appmotion_gateway.tls=true

services/filestash/docker-compose.yml.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ services:
1313
deploy:
1414
labels:
1515
- traefik.enable=true
16-
- traefik.docker.network=${PUBLIC_NETWORK}
16+
- traefik.swarm.network=${PUBLIC_NETWORK}
1717
- traefik.http.services.filestash.loadbalancer.server.port=8334
1818
- traefik.http.routers.filestash.rule=Host(`${FILESTASH_DOMAIN}`)
1919
- traefik.http.routers.filestash.entrypoints=https

services/graylog/docker-compose.yml.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ services:
8888

8989
labels:
9090
- traefik.enable=true
91-
- traefik.docker.network=${PUBLIC_NETWORK}
91+
- traefik.swarm.network=${PUBLIC_NETWORK}
9292
# direct access through port
9393
- traefik.http.services.graylog.loadbalancer.server.port=9000
9494
- traefik.http.routers.graylog.rule=Host(`${MONITORING_DOMAIN}`) && PathPrefix(`/graylog`)

services/jaeger/docker-compose.yml.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ services:
1717
- node.labels.ops==true
1818
labels:
1919
- traefik.enable=true
20-
- traefik.docker.network=${PUBLIC_NETWORK}
20+
- traefik.swarm.network=${PUBLIC_NETWORK}
2121
- traefik.http.services.jaeger.loadbalancer.server.port=16686
2222
- traefik.http.routers.jaeger.rule=Host(`${MONITORING_DOMAIN}`) && PathPrefix(`/jaeger`)
2323
- traefik.http.routers.jaeger.entrypoints=https

services/maintenance-page/docker-compose.yml.j2

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ services:
2626
- node.labels.ops==true
2727
labels:
2828
- traefik.enable=true
29-
- traefik.docker.network=${PUBLIC_NETWORK}
29+
- traefik.swarm.network=${PUBLIC_NETWORK}
3030
- traefik.http.routers.{{"maintenance_" + j2item.replace('@','').replace(' ','').replace('.','').replace('-','').replace('\'','') + "_html"}}.priority={{MAINTENANCE_PAGES_TRAEFIK_PRIORITY}}
3131
- traefik.http.routers.{{"maintenance_" + j2item.replace('@','').replace(' ','').replace('.','').replace('-','').replace('\'','') + "_html"}}.rule=Host(`{{VENDOR_MANUAL_SUBDOMAIN_PREFIX}}.{{j2item}}`) || (Host(`{{j2item}}`) && PathPrefix(`/`)) || (HostRegexp(`services.{{j2item}}`,`{subhost:[a-zA-Z0-9-]+}.services.{{j2item}}`) && PathPrefix(`/`))
3232
- traefik.http.routers.{{"maintenance_" + j2item.replace('@','').replace(' ','').replace('.','').replace('-','').replace('\'','') + "_html"}}.tls=true
@@ -50,7 +50,7 @@ services:
5050
- node.labels.ops==true
5151
labels:
5252
- traefik.enable=true
53-
- traefik.docker.network=${PUBLIC_NETWORK}
53+
- traefik.swarm.network=${PUBLIC_NETWORK}
5454
- traefik.http.routers.nginx_api.priority={{MAINTENANCE_PAGES_TRAEFIK_PRIORITY}}
5555
- traefik.http.routers.nginx_api.tls=true
5656
- traefik.http.routers.nginx_api.rule=${DEPLOYMENT_API_DOMAIN_CAPTURE_TRAEFIK_RULE}

services/minio/docker-compose.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ services:
2222
window: 60s
2323
labels:
2424
- traefik.enable=true
25-
- traefik.docker.network=${PUBLIC_NETWORK}
25+
- traefik.swarm.network=${PUBLIC_NETWORK}
2626
# direct access without path (necessary for minio client it does not like /path)
2727
- traefik.http.services.minio9000.loadbalancer.server.port=9000
2828
- traefik.http.services.minio9000.loadbalancer.healthcheck.path=/minio/health/ready

services/monitoring/docker-compose.yml.j2

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ services:
5252
deploy:
5353
labels:
5454
- traefik.enable=true
55-
- traefik.docker.network=${PUBLIC_NETWORK}
55+
- traefik.swarm.network=${PUBLIC_NETWORK}
5656
# direct access through port
5757
- traefik.http.services.prometheuscatchall.loadbalancer.server.port=${MONITORING_PROMETHEUS_PORT}
5858
- traefik.http.routers.prometheuscatchall.rule=Host(`${MONITORING_DOMAIN}`) && PathPrefix(`/prometheus`)
@@ -98,7 +98,7 @@ services:
9898
deploy:
9999
labels:
100100
- traefik.enable=true
101-
- traefik.docker.network=${PUBLIC_NETWORK}
101+
- traefik.swarm.network=${PUBLIC_NETWORK}
102102
# direct access through port
103103
- traefik.http.services.prometheusfederation.loadbalancer.server.port=${MONITORING_PROMETHEUS_PORT}
104104
- traefik.http.routers.prometheusfederation.rule=Host(`${MONITORING_DOMAIN}`) && PathPrefix(`/prometheusfederation`)
@@ -232,7 +232,7 @@ services:
232232
# condition: on-failure
233233
labels:
234234
- traefik.enable=true
235-
- traefik.docker.network=${PUBLIC_NETWORK}
235+
- traefik.swarm.network=${PUBLIC_NETWORK}
236236
# direct access through port
237237
- traefik.http.services.grafana.loadbalancer.server.port=3000
238238
- traefik.http.routers.grafana.rule=Host(`${MONITORING_DOMAIN}`) && PathPrefix(`/grafana`)
@@ -380,7 +380,7 @@ services:
380380
deploy:
381381
labels:
382382
- traefik.enable=true
383-
- traefik.docker.network=${PUBLIC_NETWORK}
383+
- traefik.swarm.network=${PUBLIC_NETWORK}
384384
- traefik.http.services.tempo.loadbalancer.server.port=9095
385385
- traefik.http.routers.tempo.rule=Host(`${MONITORING_DOMAIN}`) && PathPrefix(`/tempo`)
386386
- traefik.http.routers.tempo.priority=10

services/redis-commander/docker-compose.yml.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ services:
2424
- node.labels.ops == true
2525
labels:
2626
- traefik.enable=true
27-
- traefik.docker.network=${PUBLIC_NETWORK}
27+
- traefik.swarm.network=${PUBLIC_NETWORK}
2828
- traefik.http.services.redis.loadbalancer.server.port=8081
2929
- traefik.http.routers.redis.rule=Host(`${MONITORING_DOMAIN}`) && PathPrefix(`/redis`)
3030
- traefik.http.routers.redis.entrypoints=https

services/registry/docker-compose.yml.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ services:
5353
cpus: '0.1'
5454
labels:
5555
- traefik.enable=true
56-
- traefik.docker.network=${PUBLIC_NETWORK}
56+
- traefik.swarm.network=${PUBLIC_NETWORK}
5757
# direct access through port
5858
- traefik.http.services.registry.loadbalancer.server.port=5000
5959
- traefik.http.routers.registry.rule=Host(`${REGISTRY_DOMAIN}`)

services/simcore/docker-compose.yml.j2

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,7 @@ services:
348348
labels:
349349
# internal traefik
350350
- traefik.enable=true
351-
- traefik.docker.network=${SWARM_STACK_NAME}_default
351+
- traefik.swarm.network=${SWARM_STACK_NAME}_default
352352
- io.simcore.zone=${TRAEFIK_SIMCORE_ZONE}
353353
- traefik.http.routers.${SWARM_STACK_NAME}_storage.rule=${DEPLOYMENT_FQDNS_CAPTURE_STORAGE}
354354
- traefik.http.routers.${SWARM_STACK_NAME}_storage.entrypoints=http
@@ -538,7 +538,7 @@ services:
538538
- node.labels.simcore==true
539539
labels:
540540
- traefik.enable=true
541-
- traefik.docker.network=${PUBLIC_NETWORK}
541+
- traefik.swarm.network=${PUBLIC_NETWORK}
542542
- traefik.http.services.${PREFIX_STACK_NAME}_dask_scheduler.loadbalancer.server.port=8787
543543
- traefik.http.routers.${PREFIX_STACK_NAME}_dask_scheduler.rule=Host(`${MONITORING_DOMAIN}`) && PathPrefix(`/${PREFIX_STACK_NAME}_dask`)
544544
- traefik.http.routers.${PREFIX_STACK_NAME}_dask_scheduler.entrypoints=https
@@ -630,7 +630,7 @@ services:
630630
replicas: ${RABBIT_SELF_HOSTED_REPLICAS}
631631
labels:
632632
- traefik.enable=true
633-
- traefik.docker.network=${PUBLIC_NETWORK}
633+
- traefik.swarm.network=${PUBLIC_NETWORK}
634634
- traefik.http.services.${PREFIX_STACK_NAME}_rabbit_console.loadbalancer.server.port=15672
635635
- traefik.http.routers.${PREFIX_STACK_NAME}_rabbit_console.rule=Host(`${MONITORING_DOMAIN}`) && PathPrefix(`/${PREFIX_STACK_NAME}_rabbit`)
636636
- traefik.http.routers.${PREFIX_STACK_NAME}_rabbit_console.entrypoints=https
@@ -724,7 +724,7 @@ services:
724724
labels:
725725
- traefik.enable=true
726726
- io.simcore.zone=${TRAEFIK_SIMCORE_ZONE}
727-
- traefik.docker.network=${PUBLIC_NETWORK}
727+
- traefik.swarm.network=${PUBLIC_NETWORK}
728728
- traefik.tcp.services.${SWARM_STACK_NAME}_postgres.loadBalancer.server.port=5432
729729
- traefik.tcp.routers.postgres.service=${SWARM_STACK_NAME}_postgres
730730
- traefik.tcp.routers.postgres.entrypoints=postgres
@@ -763,7 +763,7 @@ services:
763763
- prometheus-port=8082
764764
# external traefik
765765
- traefik.enable=true
766-
- traefik.docker.network=${PUBLIC_NETWORK}
766+
- traefik.swarm.network=${PUBLIC_NETWORK}
767767
# oSparc web
768768
- traefik.http.services.${SWARM_STACK_NAME}_simcore_http.loadbalancer.server.port=80
769769
- traefik.http.routers.${SWARM_STACK_NAME}_simcore_http.entrypoints=https
@@ -930,7 +930,7 @@ services:
930930
cpus: '0.1'
931931
labels:
932932
- traefik.enable=true
933-
- traefik.docker.network=${PUBLIC_NETWORK}
933+
- traefik.swarm.network=${PUBLIC_NETWORK}
934934
# dynamic-scheduler service
935935
- traefik.http.services.${PREFIX_STACK_NAME}_dynamic_scheduler.loadbalancer.server.port=8000
936936
- traefik.http.services.${PREFIX_STACK_NAME}_dynamic_scheduler.loadbalancer.sticky.cookie=true

services/traefik/docker-compose.yml.j2

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ services:
8282
- node.role == manager
8383
labels:
8484
- traefik.enable=true
85-
- traefik.docker.network=${PUBLIC_NETWORK}
85+
- traefik.swarm.network=${PUBLIC_NETWORK}
8686
# ssl header necessary so that socket.io upgrades correctly from polling to websocket mode. the middleware must be attached to the right connection.
8787
- traefik.http.middlewares.ops_sslheader.headers.customrequestheaders.X-Forwarded-Proto=https
8888
####### SECURITY HEADERS --> See https://infosec.mozilla.org/guidelines/web_security
@@ -195,7 +195,7 @@ services:
195195
- node.labels.traefik==true
196196
labels:
197197
- traefik.enable=true
198-
- traefik.docker.network=${PUBLIC_NETWORK}
198+
- traefik.swarm.network=${PUBLIC_NETWORK}
199199
- traefik.http.services.whoami.loadbalancer.server.port=80
200200
- traefik.http.routers.whoami.rule=Host(`${MONITORING_DOMAIN}`) &&
201201
PathPrefix(`/whoami`)

services/vendors/docker-compose.yml.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ services:
2626
delay: 10s
2727
labels:
2828
- traefik.enable=true
29-
- traefik.docker.network=${PUBLIC_NETWORK}
29+
- traefik.swarm.network=${PUBLIC_NETWORK}
3030
- traefik.http.services.vendor_manual.loadbalancer.server.port=${VENDOR_MANUAL_PORT}
3131
- traefik.http.routers.vendor_manual.entrypoints=https
3232
- traefik.http.routers.vendor_manual.tls=true

0 commit comments

Comments
 (0)