🐛Traefik v3: adapt Go regexp (2nd trial) (#6273)

Author: sanderegg

services/director-v2/src/simcore_service_director_v2/modules/dynamic_sidecar/docker_service_specs/proxy.py

@@ -91,7 +91,7 @@ def get_dynamic_proxy_spec(
             f"traefik.http.services.{scheduler_data.proxy_service_name}.loadbalancer.server.port": "80",
             f"traefik.http.routers.{scheduler_data.proxy_service_name}.entrypoints": "http",
             f"traefik.http.routers.{scheduler_data.proxy_service_name}.priority": "10",
-            f"traefik.http.routers.{scheduler_data.proxy_service_name}.rule": rf"HostRegexp(`{scheduler_data.node_uuid}.services.{{host:.+}}`)",
+            f"traefik.http.routers.{scheduler_data.proxy_service_name}.rule": rf"HostRegexp(`{scheduler_data.node_uuid}\.services\.(?P<host>.+)`)",
             f"traefik.http.routers.{scheduler_data.proxy_service_name}.middlewares": f"{dynamic_services_scheduler_settings.SWARM_STACK_NAME}_gzip@swarm, {scheduler_data.proxy_service_name}-security-headers",
             "dynamic_type": "dynamic-sidecar",  # tagged as dynamic service
         }

services/docker-compose.yml

@@ -541,7 +541,7 @@ services:
         - traefik.http.routers.${SWARM_STACK_NAME}_modern_services_catchall.priority=3
         - traefik.http.routers.${SWARM_STACK_NAME}_modern_services_catchall.entrypoints=http
         # in theory the pattern should be uuid.services.OSPARC_DOMAIN, but anything could go through.. so let's catch everything
-        - traefik.http.routers.${SWARM_STACK_NAME}_modern_services_catchall.rule=HostRegexp(`{node_uuid:(?i)[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}}.services.{host:.+}`)
+        - traefik.http.routers.${SWARM_STACK_NAME}_modern_services_catchall.rule=HostRegexp(`(?P<node_uuid>(?i)[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12})\\.services\\.(?P<host>.+)`)
         # this tricks traefik into a 502 (bad gateway) since the service does not exist on this port
         - traefik.http.services.${SWARM_STACK_NAME}_modern_services_catchall.loadbalancer.server.port=0
         # this tricks traefik into returning a 503 (service unavailable) since the healthcheck will always return false
@@ -606,7 +606,6 @@ services:
       DIRECTOR_V2_HOST: ${DIRECTOR_V2_HOST}
       DIRECTOR_V2_PORT: ${DIRECTOR_V2_PORT}
 
-
       # WEBSERVER_EMAIL
       WEBSERVER_EMAIL: ${WEBSERVER_EMAIL}
       SMTP_HOST: ${SMTP_HOST}
@@ -1092,15 +1091,7 @@ services:
       - default
       - interactive_services_subnet
     healthcheck:
-      test:
-        [
-          "CMD",
-          "pg_isready",
-          "--username",
-          "${POSTGRES_USER}",
-          "--dbname",
-          "${POSTGRES_DB}"
-        ]
+      test: [ "CMD", "pg_isready", "--username", "${POSTGRES_USER}", "--dbname", "${POSTGRES_DB}" ]
       interval: 5s
       retries: 5
     # NOTES: this is not yet compatible with portainer deployment but could work also for other containers
@@ -1113,20 +1104,7 @@ services:
     #   - net.ipv4.tcp_keepalive_intvl=600
     #   - net.ipv4.tcp_keepalive_probes=9
     #   - net.ipv4.tcp_keepalive_time=600
-    command:
-      [
-        "postgres",
-        "-c",
-        "tcp_keepalives_idle=600",
-        "-c",
-        "tcp_keepalives_interval=600",
-        "-c",
-        "tcp_keepalives_count=5",
-        "-c",
-        "max_connections=413",
-        "-c",
-        "shared_buffers=256MB"
-      ]
+    command: [ "postgres", "-c", "tcp_keepalives_idle=600", "-c", "tcp_keepalives_interval=600", "-c", "tcp_keepalives_count=5", "-c", "max_connections=413", "-c", "shared_buffers=256MB" ]
 
   redis:
     image: "redis:6.2.6@sha256:4bed291aa5efb9f0d77b76ff7d4ab71eee410962965d052552db1fb80576431d"
@@ -1137,19 +1115,7 @@ services:
       # also aof (append only) is also enabled such that we get full durability at the expense
       # of backup size. The backup is written into /data.
       # https://redis.io/topics/persistence
-      [
-        "redis-server",
-        "--save",
-        "60 1",
-        "--loglevel",
-        "verbose",
-        "--databases",
-        "8",
-        "--appendonly",
-        "yes",
-        "--requirepass",
-        "${REDIS_PASSWORD}"
-      ]
+      [ "redis-server", "--save", "60 1", "--loglevel", "verbose", "--databases", "8", "--appendonly", "yes", "--requirepass", "${REDIS_PASSWORD}" ]
     networks:
       - default
       - autoscaling_subnet
@@ -1221,7 +1187,6 @@ services:
       - default
       - interactive_services_subnet # for legacy dynamic services
 
-
 volumes:
   postgres_data:
     name: ${SWARM_STACK_NAME}_postgres_data