Skip to content

Update traefik router hardcoded priorities #953

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
Jan 30, 2025
Merged

Update traefik router hardcoded priorities #953

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
cc2971a
Update traefik router hardcoded priorities
YuryHrytsuk Jan 30, 2025
ba6baeb
remove hardcoded priority from adminpanels
YuryHrytsuk Jan 30, 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
1 change: 0 additions & 1 deletion services/admin-panels/docker-compose.yml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,6 @@ services:
- traefik.http.services.adminpanels.loadbalancer.server.port=8888
- traefik.http.routers.adminpanels.rule=Host(`${ADMINPANELS_DOMAIN}`)
- 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
placement:
Expand Down
1 change: 0 additions & 1 deletion services/registry/docker-compose.yml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ services:
- traefik.http.routers.registry.rule=Host(`${REGISTRY_DOMAIN}`)
- 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
- prometheus-job=registry
- prometheus-port=5001
Expand Down
12 changes: 6 additions & 6 deletions services/simcore/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ services:
- traefik.http.routers.${SWARM_STACK_NAME}_apiserver_swagger.service=${SWARM_STACK_NAME}_api-server
- traefik.http.routers.${SWARM_STACK_NAME}_apiserver_swagger.rule=PathPrefix(`/dev/`)
- traefik.http.routers.${SWARM_STACK_NAME}_apiserver_swagger.entrypoints=simcore_api
- traefik.http.routers.${SWARM_STACK_NAME}_apiserver_swagger.priority=2
- traefik.http.routers.${SWARM_STACK_NAME}_apiserver_swagger.priority=6
update_config:
parallelism: 2
order: start-first
Expand Down Expand Up @@ -153,7 +153,7 @@ services:
- traefik.http.routers.${SWARM_STACK_NAME}_static_webserver_freshping.service=${SWARM_STACK_NAME}_static_webserver_freshping
- traefik.http.services.${SWARM_STACK_NAME}_static_webserver_freshping.loadbalancer.server.port=8000
- traefik.http.routers.${SWARM_STACK_NAME}_static_webserver_freshping.entrypoints=http
- traefik.http.routers.${SWARM_STACK_NAME}_static_webserver_freshping.priority=10 # High number means high priority
- traefik.http.routers.${SWARM_STACK_NAME}_static_webserver_freshping.priority=12 # High number means high priority
- traefik.http.routers.${SWARM_STACK_NAME}_static_webserver_freshping.middlewares=${SWARM_STACK_NAME}_gzip@swarm,${SWARM_STACK_NAME}_static_webserver_retry,${SWARM_STACK_NAME}_static_webserver_prefix
update_config:
parallelism: 2
Expand Down Expand Up @@ -229,7 +229,7 @@ services:
- traefik.http.routers.${SWARM_STACK_NAME}_webserver_swagger.middlewares=${SWARM_STACK_NAME}_gzip@swarm, ${SWARM_STACK_NAME_NO_HYPHEN}_sslheader
- traefik.http.routers.${SWARM_STACK_NAME}_webserver_swagger.rule=PathPrefix(`/dev/`)
- traefik.http.routers.${SWARM_STACK_NAME}_webserver_swagger.entrypoints=http
- traefik.http.routers.${SWARM_STACK_NAME}_webserver_swagger.priority=2
- traefik.http.routers.${SWARM_STACK_NAME}_webserver_swagger.priority=6
- traefik.http.middlewares.${SWARM_STACK_NAME_NO_HYPHEN}_webserver_swagger_auth.basicauth.users=${TRAEFIK_USER}:${TRAEFIK_PASSWORD}
- traefik.http.routers.${SWARM_STACK_NAME}_webserver_swagger.middlewares=${SWARM_STACK_NAME_NO_HYPHEN}_webserver_swagger_auth, ${SWARM_STACK_NAME_NO_HYPHEN}_sslheader
update_config: &webserver_update_config
Expand Down Expand Up @@ -726,7 +726,7 @@ services:
- traefik.http.routers.${SWARM_STACK_NAME}_simcore_http.middlewares=ops_gzip@swarm, ops_sslheader@swarm, ops_ratelimit@swarm
- traefik.http.routers.${SWARM_STACK_NAME}_simcore_http.service=${SWARM_STACK_NAME}_simcore_http
- traefik.http.routers.${SWARM_STACK_NAME}_simcore_http.rule=((${DEPLOYMENT_FQDNS_CAPTURE_TRAEFIK_RULE_CATCHALL}) && PathPrefix(`/`)) || ( (PathPrefix(`/dashboard`) || PathPrefix(`/api`) ) && Host(`traefikdashboard.${MACHINE_FQDN}`))
- traefik.http.routers.${SWARM_STACK_NAME}_simcore_http.priority=1 # Lowest possible priority, maintenance page takes priority "2" (higher, maintenance page has precedent) if it is up
- traefik.http.routers.${SWARM_STACK_NAME}_simcore_http.priority=3
# oSparc publicAPI
- traefik.http.routers.${SWARM_STACK_NAME}_simcore_api.rule=(${DEPLOYMENT_API_DOMAIN_CAPTURE_TRAEFIK_RULE}) && PathPrefix(`/`)
- traefik.http.routers.${SWARM_STACK_NAME}_simcore_api.entrypoints=https
Expand Down Expand Up @@ -785,7 +785,7 @@ services:
- traefik.http.routers.${SWARM_STACK_NAME}_traefik_api.service=api@internal
- traefik.http.routers.${SWARM_STACK_NAME}_traefik_api.rule=(PathPrefix(`/dashboard`) || PathPrefix(`/api`) ) && Host(`traefikdashboard.${MACHINE_FQDN}`)
- traefik.http.routers.${SWARM_STACK_NAME}_traefik_api.entrypoints=http
- traefik.http.routers.${SWARM_STACK_NAME}_traefik_api.priority=2
- traefik.http.routers.${SWARM_STACK_NAME}_traefik_api.priority=6
- traefik.http.routers.${SWARM_STACK_NAME}_traefik_api.middlewares=${SWARM_STACK_NAME}_auth@swarm, ${SWARM_STACK_NAME}_whitelist_ips@swarm
- traefik.http.services.${SWARM_STACK_NAME}_traefik_api.loadbalancer.server.port=8080
# Middlewares
Expand Down Expand Up @@ -829,7 +829,7 @@ services:
- traefik.http.services.${SWARM_STACK_NAME}_whoami.loadbalancer.server.port=80
- traefik.http.routers.${SWARM_STACK_NAME}_whoami.rule=PathPrefix(`/whoami`)
- traefik.http.routers.${SWARM_STACK_NAME}_whoami.entrypoints=http
- traefik.http.routers.${SWARM_STACK_NAME}_whoami.priority=2
- traefik.http.routers.${SWARM_STACK_NAME}_whoami.priority=6
- traefik.http.routers.${SWARM_STACK_NAME}_whoami.middlewares=${SWARM_STACK_NAME}_auth@swarm,${SWARM_STACK_NAME}_gzip@swarm
update_config:
parallelism: 2
Expand Down
Loading