Revert traefik v3 (#742)

Co-authored-by: Dustin Kaiser <[email protected]>
ITISFoundation · Aug 14, 2024 · 6b0cb8d · 6b0cb8d
1 parent 7e254b4
commit 6b0cb8d
Show file tree

Hide file tree

Showing 21 changed files with 121 additions and 118 deletions.
diff --git a/services/admin-panels/docker-compose.yml.j2 b/services/admin-panels/docker-compose.yml.j2
@@ -91,7 +91,7 @@ services:
         - traefik.http.routers.adminpanels.entrypoints=https
         - traefik.http.routers.adminpanels.priority=1
         - traefik.http.routers.adminpanels.tls=true
-        - traefik.http.routers.adminpanels.middlewares=ops_whitelist_ips@swarm, ops_gzip@swarm
+        - traefik.http.routers.adminpanels.middlewares=ops_whitelist_ips@docker, ops_gzip@docker
       placement:
         constraints:
           - node.labels.ops==true

diff --git a/services/appmotion_gateway/docker-compose.yml b/services/appmotion_gateway/docker-compose.yml
@@ -19,7 +19,7 @@ services:
                 - traefik.http.routers.adminer_appmotion_gateway.entrypoints=https
                 - traefik.http.routers.adminer_appmotion_gateway.tls=true
                 - traefik.http.middlewares.adminer_appmotion_gateway_stripprefixregex.stripprefixregex.regex=^/adminer
-                - traefik.http.routers.adminer_appmotion_gateway.middlewares=ops_whitelist_ips@swarm, ops_gzip@swarm, adminer_appmotion_gateway_stripprefixregex
+                - traefik.http.routers.adminer_appmotion_gateway.middlewares=ops_whitelist_ips@docker, ops_gzip@docker, adminer_appmotion_gateway_stripprefixregex
             resources:
                 reservations:
                     memory: 16M
@@ -80,7 +80,7 @@ services:
                 - traefik.http.routers.appmotion_gateway.entrypoints=https
                 - traefik.http.routers.appmotion_gateway.tls=true
                 - traefik.http.services.appmotion_gateway.loadbalancer.server.port=80
-                - traefik.http.routers.appmotion_gateway.middlewares=ops_ratelimit@swarm
+                - traefik.http.routers.appmotion_gateway.middlewares=ops_ratelimit@docker
             resources:
                 limits:
                     memory: 1G

diff --git a/services/graylog/docker-compose.yml b/services/graylog/docker-compose.yml
@@ -95,7 +95,7 @@ services:
         - traefik.http.routers.graylog.tls=true
         - traefik.http.middlewares.graylog_replace_regex.replacepathregex.regex=^/graylog/?(.*)$$
         - traefik.http.middlewares.graylog_replace_regex.replacepathregex.replacement=/$${1}
-        - traefik.http.routers.graylog.middlewares=ops_whitelist_ips@swarm, ops_gzip@swarm, graylog_replace_regex
+        - traefik.http.routers.graylog.middlewares=ops_whitelist_ips@docker, ops_gzip@docker, graylog_replace_regex
 
 volumes:
   mongo_data:

diff --git a/services/jaeger/docker-compose.yml b/services/jaeger/docker-compose.yml
@@ -19,7 +19,7 @@ services:
         - traefik.http.routers.jaeger.rule=Host(`${MONITORING_DOMAIN}`) && PathPrefix(`/jaeger`)
         - traefik.http.routers.jaeger.entrypoints=https
         - traefik.http.routers.jaeger.tls=true
-        - traefik.http.routers.jaeger.middlewares=ops_whitelist_ips@swarm, ops_auth@swarm, ops_gzip@swarm
+        - traefik.http.routers.jaeger.middlewares=ops_whitelist_ips@docker, ops_auth@docker, ops_gzip@docker
         - prometheus-job=jaeger
         - prometheus-port=14269
       resources:

diff --git a/services/minio/docker-compose.yaml.j2 b/services/minio/docker-compose.yaml.j2
@@ -46,7 +46,7 @@ services:
         - traefik.http.routers.minio.rule=Host(`${STORAGE_DOMAIN}`)
         - traefik.http.routers.minio.entrypoints=https
         - traefik.http.routers.minio.tls=true
-        - traefik.http.routers.minio.middlewares=ops_gzip@swarm
+        - traefik.http.routers.minio.middlewares=ops_gzip@docker
     command: >
       server
       {%- for i in range(num_minios|int) %}

diff --git a/services/monitoring/docker-compose.yml.j2 b/services/monitoring/docker-compose.yml.j2
@@ -90,7 +90,7 @@ services:
         - traefik.http.routers.prometheuscatchall.entrypoints=https
         - traefik.http.routers.prometheuscatchall.tls=true
         - traefik.http.middlewares.prometheuscatchall_stripprefixregex.stripprefixregex.regex=^/prometheus
-        - traefik.http.routers.prometheuscatchall.middlewares=ops_whitelist_ips@swarm, ops_auth@swarm, ops_gzip@swarm, prometheuscatchall_stripprefixregex
+        - traefik.http.routers.prometheuscatchall.middlewares=ops_whitelist_ips@docker, ops_auth@docker, ops_gzip@docker, prometheuscatchall_stripprefixregex
         - prometheus-job=prometheuscatchall
         - prometheus-port=${MONITORING_PROMETHEUS_PORT}
       resources:
@@ -136,7 +136,7 @@ services:
         - traefik.http.routers.prometheusfederation.entrypoints=https
         - traefik.http.routers.prometheusfederation.tls=true
         - traefik.http.middlewares.prometheusfederation_stripprefixregex.stripprefixregex.regex=^/prometheusfederation
-        - traefik.http.routers.prometheusfederation.middlewares=ops_whitelist_ips@swarm, ops_auth@swarm, ops_gzip@swarm, prometheusfederation_stripprefixregex
+        - traefik.http.routers.prometheusfederation.middlewares=ops_whitelist_ips@docker, ops_auth@docker, ops_gzip@docker, prometheusfederation_stripprefixregex
         - prometheus-job=prometheusfederation
         - prometheus-port=${MONITORING_PROMETHEUS_PORT}
       resources:
@@ -271,7 +271,7 @@ services:
         - traefik.http.routers.grafana.tls=true
         - traefik.http.middlewares.grafana_replace_regex.replacepathregex.regex=^/grafana/?(.*)$$
         - traefik.http.middlewares.grafana_replace_regex.replacepathregex.replacement=/$${1}
-        - traefik.http.routers.grafana.middlewares=ops_whitelist_ips@swarm, ops_gzip@swarm, grafana_replace_regex
+        - traefik.http.routers.grafana.middlewares=ops_whitelist_ips@docker, ops_gzip@docker, grafana_replace_regex
       resources:
         limits:
           memory: 256M

diff --git a/services/portainer/docker-compose.yml b/services/portainer/docker-compose.yml
@@ -61,7 +61,7 @@ services:
         - traefik.http.routers.portainer.tls=true
         - traefik.http.middlewares.portainer_replace_regex.replacepathregex.regex=^/portainer/?(.*)$$
         - traefik.http.middlewares.portainer_replace_regex.replacepathregex.replacement=/$${1}
-        - traefik.http.routers.portainer.middlewares=ops_whitelist_ips@swarm, ops_gzip@swarm, portainer_replace_regex
+        - traefik.http.routers.portainer.middlewares=ops_whitelist_ips@docker, ops_gzip@docker, portainer_replace_regex
 
 networks:
   agent_network:

diff --git a/services/redis-commander/docker-compose.yml b/services/redis-commander/docker-compose.yml
@@ -29,7 +29,7 @@ services:
         - traefik.http.routers.redis.entrypoints=https
         - traefik.http.routers.redis.tls=true
         - traefik.http.middlewares.redis_stripprefixregex.stripprefixregex.regex=^/redis
-        - traefik.http.routers.redis.middlewares=ops_auth@swarm, ops_gzip@swarm, ops_whitelist_ips@swarm
+        - traefik.http.routers.redis.middlewares=ops_auth@docker, ops_gzip@docker, ops_whitelist_ips@docker
       resources:
         limits:
           memory: 192M

diff --git a/services/registry/docker-compose.yml b/services/registry/docker-compose.yml
@@ -53,7 +53,7 @@ services:
         - traefik.http.routers.registry.entrypoints=https
         - traefik.http.routers.registry.tls=true
         - traefik.http.routers.registry.priority=10
-        - traefik.http.routers.registry.middlewares=ops_gzip@swarm, ops_auth@swarm
+        - traefik.http.routers.registry.middlewares=ops_gzip@docker, ops_auth@docker
         - prometheus-job=registry
         - prometheus-port=5001
 

diff --git a/services/simcore/docker-compose.deploy.aws.yml b/services/simcore/docker-compose.deploy.aws.yml
@@ -43,15 +43,17 @@ services:
       - "--entryPoints.simcore_api.forwardedHeaders.insecure"
       - "--entryPoints.traefik_monitor.address=:8080"
       - "--entryPoints.traefik_monitor.forwardedHeaders.insecure"
-      - "--providers.swarm.endpoint=unix:///var/run/docker.sock"
-      - "--providers.swarm.network=${SWARM_STACK_NAME}_default"      # https://github.com/traefik/traefik/issues/7886
-      - "--providers.swarm.refreshSeconds=1"
-      - "--providers.swarm.exposedByDefault=false"
-      - "--providers.swarm.constraints=Label(`io.simcore.zone`, `${TRAEFIK_SIMCORE_ZONE}`)"
+      - "--providers.docker.endpoint=unix:///var/run/docker.sock"
+      - "--providers.docker.network=${SWARM_STACK_NAME}_default"
+      - "--providers.docker.swarmMode=true"
+      # https://github.com/traefik/traefik/issues/7886
+      - "--providers.docker.swarmModeRefreshSeconds=1"
+      - "--providers.docker.exposedByDefault=false"
+      - "--providers.docker.constraints=Label(`io.simcore.zone`, `${TRAEFIK_SIMCORE_ZONE}`)"
       - "--tracing=true"
-      - "--tracing.addinternals"
-      - "--tracing.otlp=true"
-      - "--tracing.otlp.http=true"
+      - "--tracing.jaeger=true"
+      - "--tracing.jaeger.samplingServerURL=http://jaeger:5778/sampling"
+      - "--tracing.jaeger.localAgentHostPort=jaeger:6831"
     deploy:
       resources:
         limits:

diff --git a/services/simcore/docker-compose.deploy.dalco.yml b/services/simcore/docker-compose.deploy.dalco.yml
@@ -41,16 +41,17 @@ services:
       - "--entryPoints.simcore_api.forwardedHeaders.insecure"
       - "--entryPoints.traefik_monitor.address=:8080"
       - "--entryPoints.traefik_monitor.forwardedHeaders.insecure"
-      - "--providers.swarm.endpoint=unix:///var/run/docker.sock"
-      - "--providers.swarm.network=${SWARM_STACK_NAME}_default"
+      - "--providers.docker.endpoint=unix:///var/run/docker.sock"
+      - "--providers.docker.network=${SWARM_STACK_NAME}_default"
+      - "--providers.docker.swarmMode=true"
       # https://github.com/traefik/traefik/issues/7886
-      - "--providers.swarm.refreshSeconds=1"
-      - "--providers.swarm.exposedByDefault=false"
-      - "--providers.swarm.constraints=Label(`io.simcore.zone`, `${TRAEFIK_SIMCORE_ZONE}`)"
+      - "--providers.docker.swarmModeRefreshSeconds=1"
+      - "--providers.docker.exposedByDefault=false"
+      - "--providers.docker.constraints=Label(`io.simcore.zone`, `${TRAEFIK_SIMCORE_ZONE}`)"
       - "--tracing=true"
-      - "--tracing.addinternals"
-      - "--tracing.otlp=true"
-      - "--tracing.otlp.http=true"
+      - "--tracing.jaeger=true"
+      - "--tracing.jaeger.samplingServerURL=http://jaeger:5778/sampling"
+      - "--tracing.jaeger.localAgentHostPort=jaeger:6831"
     deploy:
       resources:
         limits:

diff --git a/services/simcore/docker-compose.deploy.local.yml b/services/simcore/docker-compose.deploy.local.yml
@@ -94,16 +94,17 @@ services:
       - "--entryPoints.simcore_api.forwardedHeaders.insecure"
       - "--entryPoints.traefik_monitor.address=:8080"
       - "--entryPoints.traefik_monitor.forwardedHeaders.insecure"
-      - "--providers.swarm.endpoint=unix:///var/run/docker.sock"
-      - "--providers.swarm.network=${SWARM_STACK_NAME}_default"
+      - "--providers.docker.endpoint=unix:///var/run/docker.sock"
+      - "--providers.docker.network=${SWARM_STACK_NAME}_default"
+      - "--providers.docker.swarmMode=true"
       # https://github.com/traefik/traefik/issues/7886
-      - "--providers.swarm.refreshSeconds=1"
-      - "--providers.swarm.exposedByDefault=false"
-      - "--providers.swarm.constraints=Label(`io.simcore.zone`, `${TRAEFIK_SIMCORE_ZONE}`)"
+      - "--providers.docker.swarmModeRefreshSeconds=1"
+      - "--providers.docker.exposedByDefault=false"
+      - "--providers.docker.constraints=Label(`io.simcore.zone`, `${TRAEFIK_SIMCORE_ZONE}`)"
       - "--tracing=true"
-      - "--tracing.addinternals"
-      - "--tracing.otlp=true"
-      - "--tracing.otlp.http=true"
+      - "--tracing.jaeger=true"
+      - "--tracing.jaeger.samplingServerURL=http://jaeger:5778/sampling"
+      - "--tracing.jaeger.localAgentHostPort=jaeger:6831"
     deploy:
       labels:
         # oSparc postgres

diff --git a/services/simcore/docker-compose.deploy.master.yml b/services/simcore/docker-compose.deploy.master.yml
@@ -36,16 +36,17 @@ services:
       - "--entryPoints.simcore_api.forwardedHeaders.insecure"
       - "--entryPoints.traefik_monitor.address=:8080"
       - "--entryPoints.traefik_monitor.forwardedHeaders.insecure"
-      - "--providers.swarm.endpoint=unix:///var/run/docker.sock"
-      - "--providers.swarm.network=${SWARM_STACK_NAME}_default"
+      - "--providers.docker.endpoint=unix:///var/run/docker.sock"
+      - "--providers.docker.network=${SWARM_STACK_NAME}_default"
+      - "--providers.docker.swarmMode=true"
       # https://github.com/traefik/traefik/issues/7886
-      - "--providers.swarm.refreshSeconds=1"
-      - "--providers.swarm.exposedByDefault=false"
-      - "--providers.swarm.constraints=Label(`io.simcore.zone`, `${TRAEFIK_SIMCORE_ZONE}`)"
+      - "--providers.docker.swarmModeRefreshSeconds=1"
+      - "--providers.docker.exposedByDefault=false"
+      - "--providers.docker.constraints=Label(`io.simcore.zone`, `${TRAEFIK_SIMCORE_ZONE}`)"
       - "--tracing=true"
-      - "--tracing.addinternals"
-      - "--tracing.otlp=true"
-      - "--tracing.otlp.http=true"
+      - "--tracing.jaeger=true"
+      - "--tracing.jaeger.samplingServerURL=http://jaeger:5778/sampling"
+      - "--tracing.jaeger.localAgentHostPort=jaeger:6831"
     deploy:
       resources:
         limits: