diff --git a/services/director-v2/src/simcore_service_director_v2/modules/dynamic_sidecar/docker_service_specs/proxy.py b/services/director-v2/src/simcore_service_director_v2/modules/dynamic_sidecar/docker_service_specs/proxy.py index 07b1adbb08b1..eb06fa02b79a 100644 --- a/services/director-v2/src/simcore_service_director_v2/modules/dynamic_sidecar/docker_service_specs/proxy.py +++ b/services/director-v2/src/simcore_service_director_v2/modules/dynamic_sidecar/docker_service_specs/proxy.py @@ -83,7 +83,7 @@ def get_dynamic_proxy_spec( "endpoint_spec": {"Ports": ports} if ports else {}, "labels": { "io.simcore.zone": f"{dynamic_services_scheduler_settings.TRAEFIK_SIMCORE_ZONE}", - "traefik.docker.network": swarm_network_name, + "traefik.swarm.network": swarm_network_name, "traefik.enable": "true", # security f"traefik.http.middlewares.{scheduler_data.proxy_service_name}-security-headers.headers.accesscontrolallowcredentials": "true", diff --git a/services/director-v2/tests/unit/with_dbs/test_modules_dynamic_sidecar_docker_api.py b/services/director-v2/tests/unit/with_dbs/test_modules_dynamic_sidecar_docker_api.py index 278b386eb86a..06a791cc745c 100644 --- a/services/director-v2/tests/unit/with_dbs/test_modules_dynamic_sidecar_docker_api.py +++ b/services/director-v2/tests/unit/with_dbs/test_modules_dynamic_sidecar_docker_api.py @@ -187,7 +187,7 @@ def dynamic_sidecar_service_spec( "name": dynamic_sidecar_service_name, "task_template": {"ContainerSpec": {"Image": "joseluisq/static-web-server"}}, "labels": { - "traefik.docker.network": "", + "traefik.swarm.network": "", "io.simcore.zone": "", f"{to_simcore_runtime_docker_label_key('project_id')}": f"{uuid4()}", f"{to_simcore_runtime_docker_label_key('user_id')}": "123", @@ -339,7 +339,7 @@ def labels_example(request: pytest.FixtureRequest) -> SimcoreServiceLabels: return request.param -@pytest.fixture(params=[None, datetime.datetime.now(tz=datetime.timezone.utc)]) +@pytest.fixture(params=[None, datetime.datetime.now(tz=datetime.UTC)]) def time_dy_sidecar_became_unreachable( request: pytest.FixtureRequest, ) -> datetime.datetime | None: diff --git a/services/director/src/simcore_service_director/producer.py b/services/director/src/simcore_service_director/producer.py index 936fbf55be96..eb8e3550815f 100644 --- a/services/director/src/simcore_service_director/producer.py +++ b/services/director/src/simcore_service_director/producer.py @@ -431,7 +431,7 @@ async def _create_docker_service_params( swarm_network_id = swarm_network["Id"] swarm_network_name = swarm_network["Name"] docker_params["networks"].append(swarm_network_id) - docker_params["labels"]["traefik.docker.network"] = swarm_network_name + docker_params["labels"]["traefik.swarm.network"] = swarm_network_name # set labels for CPU and Memory limits nano_cpus_limit = str( diff --git a/services/docker-compose-dev-vendors.yml b/services/docker-compose-dev-vendors.yml index 1465c873a15f..2c885c0ea95d 100644 --- a/services/docker-compose-dev-vendors.yml +++ b/services/docker-compose-dev-vendors.yml @@ -13,7 +13,7 @@ services: labels: - io.simcore.zone=${TRAEFIK_SIMCORE_ZONE} - traefik.enable=true - - traefik.docker.network=${SWARM_STACK_NAME}_default + - traefik.swarm.network=${SWARM_STACK_NAME}_default # auth: https://doc.traefik.io/traefik/middlewares/http/forwardauth - traefik.http.middlewares.${SWARM_STACK_NAME}_manual-auth.forwardauth.address=http://${WEBSERVER_HOST}:${WEBSERVER_PORT}/v0/auth:check - traefik.http.middlewares.${SWARM_STACK_NAME}_manual-auth.forwardauth.trustForwardHeader=true diff --git a/services/docker-compose.yml b/services/docker-compose.yml index c8168aa04f27..45756dfdd9d2 100644 --- a/services/docker-compose.yml +++ b/services/docker-compose.yml @@ -1381,13 +1381,9 @@ services: - "--metrics.prometheus.entryPoint=metrics" - "--entryPoints.http.address=:80" - "--entryPoints.http.forwardedHeaders.insecure" - - "--entryPoints.http.transport.respondingTimeouts.idleTimeout=21600s" #6h, for https://github.com/traefik/traefik/issues/10805 - - "--entryPoints.http.transport.respondingTimeouts.writeTimeout=21600s" #6h, for https://github.com/traefik/traefik/issues/10805 - "--entryPoints.http.transport.respondingTimeouts.readTimeout=21600s" #6h, for https://github.com/traefik/traefik/issues/10805 - "--entryPoints.simcore_api.address=:10081" - "--entryPoints.simcore_api.address=:10081" - "--entryPoints.simcore_api.forwardedHeaders.insecure" - - "--entryPoints.simcore_api.transport.respondingTimeouts.idleTimeout=21600s" #6h, for https://github.com/traefik/traefik/issues/10805 - - "--entryPoints.simcore_api.transport.respondingTimeouts.writeTimeout=21600s" #6h, for https://github.com/traefik/traefik/issues/10805 - "--entryPoints.simcore_api.transport.respondingTimeouts.readTimeout=21600s" #6h, for https://github.com/traefik/traefik/issues/10805 - "--entryPoints.traefik_monitor.address=:8080" - "--entryPoints.traefik_monitor.forwardedHeaders.insecure"