Skip to content

⬆️Maintenance: more upgrades due to last upgrade of traefik to 3.4 #7671

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 14, 2025
Merged

⬆️Maintenance: more upgrades due to last upgrade of traefik to 3.4 #7671

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3104fa1
removed deprecated naming
sanderegg May 13, 2025
c01c180
removed unnecessary long timeout for idle
sanderegg May 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...-v2/src/simcore_service_director_v2/modules/dynamic_sidecar/docker_service_specs/proxy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions services/director-v2/tests/unit/with_dbs/test_modules_dynamic_sidecar_docker_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion services/director/src/simcore_service_director/producer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
2 changes: 1 addition & 1 deletion services/docker-compose-dev-vendors.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 0 additions & 4 deletions services/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading