Skip to content

Commit 5534db4

Browse files
mrnicegyu11mrnicegyu11
committed
Remove dalco special staging handling
1 parent f6f4f36 commit 5534db4

File tree

7 files changed

+174
-213
lines changed

7 files changed

+174
-213
lines changed

‎services/redis-commander/README.md‎

Lines changed: 0 additions & 26 deletions
This file was deleted.

‎services/redis-commander/config.json.j2‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,6 @@
1313
{%- endmacro %}
1414
{
1515
"connections": [
16-
{#- special if for DALCO. Remove once dalco is not special case anymore #}
17-
{%- if REDIS_STAGING_DATABASES %}
18-
{%- for label in REDIS_STAGING_DATABASES.strip(',').split(',') %}
19-
{{ redis_connection(label, REDIS_STAGING_HOST, REDIS_STAGING_PORT, REDIS_STAGING_USER, REDIS_STAGING_PASSWORD, loop.index0, REDIS_STAGING_SECURE) | indent(4) }},
20-
{%- endfor %}
21-
{%- endif %}
2216
{%- if REDIS_DATABASES %}
2317
{%- for label in REDIS_DATABASES.strip(',').split(',') %}
2418
{{ redis_connection(label, REDIS_HOST, REDIS_PORT, REDIS_USER, REDIS_PASSWORD, loop.index0, REDIS_SECURE) | indent(4) }}{%- if not loop.last %},{% endif %}

‎services/redis-commander/template.env‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,5 @@ REDIS_USER=${REDIS_USER}
66
REDIS_PASSWORD=${REDIS_PASSWORD}
77
REDIS_SECURE=${REDIS_SECURE}
88
REDIS_DATABASES=${REDIS_DATABASES}
9-
REDIS_STAGING_PASSWORD=${REDIS_STAGING_PASSWORD}
10-
REDIS_STAGING_DATABASES=${REDIS_STAGING_DATABASES}
11-
REDIS_STAGING_HOST=${REDIS_STAGING_HOST}
12-
REDIS_STAGING_PORT=${REDIS_STAGING_PORT}
13-
REDIS_STAGING_USER=${REDIS_STAGING_USER}
14-
REDIS_STAGING_SECURE=${REDIS_STAGING_SECURE}
159
PUBLIC_NETWORK=${PUBLIC_NETWORK}
1610
MONITORED_NETWORK=${MONITORED_NETWORK}

‎services/simcore/docker-compose.deploy.dalco.yml‎

Lines changed: 77 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -1,79 +1,79 @@
11
services:
2-
autoscaling:
3-
deploy:
4-
replicas: 0
5-
agent:
6-
volumes:
7-
- /docker/volumes/:/docker/volumes/
8-
postgres:
9-
labels:
10-
- "pgbackup.enable=true"
11-
deploy:
12-
placement:
13-
constraints:
14-
- node.labels.postgres == true
15-
dask-sidecar:
16-
deploy:
17-
placement:
18-
constraints:
19-
- node.role == worker
2+
autoscaling:
3+
deploy:
4+
replicas: 0
5+
agent:
6+
volumes:
7+
- /docker/volumes/:/docker/volumes/
8+
postgres:
9+
labels:
10+
- "pgbackup.enable=true"
11+
deploy:
12+
placement:
13+
constraints:
14+
- node.labels.postgres == true
15+
dask-sidecar:
16+
deploy:
17+
placement:
18+
constraints:
19+
- node.role == worker
2020

21-
traefik:
22-
command:
23-
- "--api=true"
24-
- "--api.dashboard=true"
25-
- "--ping=true"
26-
- "--entryPoints.ping.address=:9082"
27-
- "--ping.entryPoint=ping"
28-
- "--log.level=${SIMCORE_TRAEFIK_LOGLEVEL}"
29-
- "--accesslog=false"
30-
- "--metrics.prometheus=true"
31-
- "--metrics.prometheus.addEntryPointsLabels=true"
32-
- "--metrics.prometheus.addServicesLabels=true"
33-
- "--entryPoints.metrics.address=:8082"
34-
- "--metrics.prometheus.entryPoint=metrics"
35-
- "--entryPoints.http.address=:80"
36-
- "--entryPoints.http.forwardedHeaders.insecure"
37-
- "--entryPoints.http.transport.respondingTimeouts.idleTimeout=21600s" #6h, for https://github.com/traefik/traefik/issues/10805
38-
- "--entryPoints.http.transport.respondingTimeouts.writeTimeout=21600s" #6h, for https://github.com/traefik/traefik/issues/10805
39-
- "--entryPoints.http.transport.respondingTimeouts.readTimeout=21600s" #6h, for https://github.com/traefik/traefik/issues/10805
40-
- "--entryPoints.postgres.address=:5432"
41-
- "--entryPoints.simcore_api.address=:10081"
42-
- "--entryPoints.simcore_api.forwardedHeaders.insecure"
43-
- "--entryPoints.simcore_api.transport.respondingTimeouts.idleTimeout=21600s" #6h, for https://github.com/traefik/traefik/issues/10805
44-
- "--entryPoints.simcore_api.transport.respondingTimeouts.writeTimeout=21600s" #6h, for https://github.com/traefik/traefik/issues/10805
45-
- "--entryPoints.simcore_api.transport.respondingTimeouts.readTimeout=21600s" #6h, for https://github.com/traefik/traefik/issues/10805
46-
- "--entryPoints.traefik_monitor.address=:8080"
47-
- "--entryPoints.traefik_monitor.forwardedHeaders.insecure"
48-
- "--providers.swarm.endpoint=unix:///var/run/docker.sock"
49-
- "--providers.swarm.network=${SWARM_STACK_NAME}_default"
50-
# https://github.com/traefik/traefik/issues/7886
51-
- "--providers.swarm.refreshSeconds=1"
52-
- "--providers.swarm.exposedByDefault=false"
53-
- "--providers.swarm.constraints=Label(`io.simcore.zone`, `${TRAEFIK_SIMCORE_ZONE}`)"
54-
- "--tracing=true"
55-
- "--tracing.addinternals"
56-
- "--tracing.otlp=true"
57-
- "--tracing.otlp.http=true"
58-
deploy:
59-
resources:
60-
limits:
61-
memory: 2048M
62-
cpus: '2.000'
63-
labels:
64-
- traefik.tcp.routers.${SWARM_STACK_NAME}_postgresRoute.entrypoints=${PREFIX_STACK_NAME}_postgres
65-
- traefik.tcp.routers.${SWARM_STACK_NAME}_postgresRoute.tls=false
66-
- traefik.tcp.routers.${SWARM_STACK_NAME}_postgresRoute.service=${SWARM_STACK_NAME}_postgresRoute
67-
- traefik.tcp.services.${SWARM_STACK_NAME}_postgresRoute.loadbalancer.server.port=5432
68-
- "traefik.tcp.routers.${SWARM_STACK_NAME}_postgresRoute.rule=ClientIP(`195.176.8.0/24`) || ClientIP(`10.0.0.0/8`) || ClientIP(`172.16.0.0/12`) || ClientIP(`192.168.0.0/16`)"
69-
wb-garbage-collector:
70-
hostname: "{{.Service.Name}}"
71-
wb-api-server:
72-
deploy:
73-
replicas: 3
74-
clusters-keeper:
75-
deploy:
76-
replicas: 0
77-
payments:
78-
deploy:
79-
replicas: 0
21+
traefik:
22+
command:
23+
- "--api=true"
24+
- "--api.dashboard=true"
25+
- "--ping=true"
26+
- "--entryPoints.ping.address=:9082"
27+
- "--ping.entryPoint=ping"
28+
- "--log.level=${SIMCORE_TRAEFIK_LOGLEVEL}"
29+
- "--accesslog=false"
30+
- "--metrics.prometheus=true"
31+
- "--metrics.prometheus.addEntryPointsLabels=true"
32+
- "--metrics.prometheus.addServicesLabels=true"
33+
- "--entryPoints.metrics.address=:8082"
34+
- "--metrics.prometheus.entryPoint=metrics"
35+
- "--entryPoints.http.address=:80"
36+
- "--entryPoints.http.forwardedHeaders.insecure"
37+
- "--entryPoints.http.transport.respondingTimeouts.idleTimeout=21600s" #6h, for https://github.com/traefik/traefik/issues/10805
38+
- "--entryPoints.http.transport.respondingTimeouts.writeTimeout=21600s" #6h, for https://github.com/traefik/traefik/issues/10805
39+
- "--entryPoints.http.transport.respondingTimeouts.readTimeout=21600s" #6h, for https://github.com/traefik/traefik/issues/10805
40+
- "--entryPoints.postgres.address=:5432"
41+
- "--entryPoints.simcore_api.address=:10081"
42+
- "--entryPoints.simcore_api.forwardedHeaders.insecure"
43+
- "--entryPoints.simcore_api.transport.respondingTimeouts.idleTimeout=21600s" #6h, for https://github.com/traefik/traefik/issues/10805
44+
- "--entryPoints.simcore_api.transport.respondingTimeouts.writeTimeout=21600s" #6h, for https://github.com/traefik/traefik/issues/10805
45+
- "--entryPoints.simcore_api.transport.respondingTimeouts.readTimeout=21600s" #6h, for https://github.com/traefik/traefik/issues/10805
46+
- "--entryPoints.traefik_monitor.address=:8080"
47+
- "--entryPoints.traefik_monitor.forwardedHeaders.insecure"
48+
- "--providers.swarm.endpoint=unix:///var/run/docker.sock"
49+
- "--providers.swarm.network=${SWARM_STACK_NAME}_default"
50+
# https://github.com/traefik/traefik/issues/7886
51+
- "--providers.swarm.refreshSeconds=1"
52+
- "--providers.swarm.exposedByDefault=false"
53+
- "--providers.swarm.constraints=Label(`io.simcore.zone`, `${TRAEFIK_SIMCORE_ZONE}`)"
54+
- "--tracing=true"
55+
- "--tracing.addinternals"
56+
- "--tracing.otlp=true"
57+
- "--tracing.otlp.http=true"
58+
deploy:
59+
resources:
60+
limits:
61+
memory: 2048M
62+
cpus: "2.000"
63+
labels:
64+
- traefik.tcp.routers.${SWARM_STACK_NAME}_postgresRoute.entrypoints=postgres
65+
- traefik.tcp.routers.${SWARM_STACK_NAME}_postgresRoute.tls=false
66+
- traefik.tcp.routers.${SWARM_STACK_NAME}_postgresRoute.service=${SWARM_STACK_NAME}_postgresRoute
67+
- traefik.tcp.services.${SWARM_STACK_NAME}_postgresRoute.loadbalancer.server.port=5432
68+
- "traefik.tcp.routers.${SWARM_STACK_NAME}_postgresRoute.rule=ClientIP(`195.176.8.0/24`) || ClientIP(`10.0.0.0/8`) || ClientIP(`172.16.0.0/12`) || ClientIP(`192.168.0.0/16`)"
69+
wb-garbage-collector:
70+
hostname: "{{.Service.Name}}"
71+
wb-api-server:
72+
deploy:
73+
replicas: 3
74+
clusters-keeper:
75+
deploy:
76+
replicas: 0
77+
payments:
78+
deploy:
79+
replicas: 0

‎services/traefik/docker-compose.dalco.yml‎

Lines changed: 47 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,51 @@
11
version: "3.7"
22
services:
3-
traefik:
4-
command:
5-
- "--api=true"
6-
- "--api.dashboard=true"
7-
- "--log.level=${OPS_TRAEFIK_LOGLEVEL}"
8-
- '--accesslog=false'
9-
- "--metrics.prometheus=true"
10-
- "--metrics.prometheus.addEntryPointsLabels=true"
11-
- "--metrics.prometheus.addServicesLabels=true"
12-
- "--entryPoints.metrics.address=:8082"
13-
- "--metrics.prometheus.entryPoint=metrics"
14-
- "--entryPoints.http.address=:80"
15-
- "--entrypoints.http.http.redirections.entrypoint.to=https"
16-
- "--entrypoints.http.http.redirections.entrypoint.scheme=https"
17-
- "--entrypoints.http.http.redirections.entrypoint.permanent=true"
18-
- "--entryPoints.http.transport.respondingTimeouts.idleTimeout=21600s" #6h, for https://github.com/traefik/traefik/issues/10805
19-
- "--entryPoints.http.transport.respondingTimeouts.writeTimeout=21600s" #6h, for https://github.com/traefik/traefik/issues/10805
20-
- "--entryPoints.http.transport.respondingTimeouts.readTimeout=21600s" #6h, for https://github.com/traefik/traefik/issues/10805
21-
- "--entryPoints.https.address=:443"
22-
- "--entryPoints.https.transport.respondingTimeouts.idleTimeout=21600s" #6h, for https://github.com/traefik/traefik/issues/10805
23-
- "--entryPoints.https.transport.respondingTimeouts.writeTimeout=21600s" #6h, for https://github.com/traefik/traefik/issues/10805
24-
- "--entryPoints.https.transport.respondingTimeouts.readTimeout=21600s" #6h, for https://github.com/traefik/traefik/issues/10805
25-
- "--entryPoints.smtp.address=:25"
26-
- "--entryPoints.production_postgres.address=:5432"
27-
- "--entryPoints.staging_postgres.address=:5433"
28-
- "--providers.swarm.endpoint=unix:///var/run/docker.sock"
29-
- "--providers.swarm.exposedByDefault=false"
30-
- "--core.defaultRuleSyntax=v2"
31-
- "--tracing=true"
32-
- "--tracing.addinternals"
33-
- "--tracing.otlp=true"
34-
- "--tracing.otlp.http=true"
35-
- "--providers.swarm.constraints=!LabelRegex(`io.simcore.zone`, `.+`)"
36-
- "--entryPoints.https.forwardedHeaders.insecure"
37-
- "--providers.file.directory=/etc/traefik/"
38-
- "--providers.file.watch=true"
39-
deploy:
40-
replicas: ${OPS_TRAEFIK_REPLICAS}
41-
placement:
42-
constraints:
43-
- node.labels.traefik==true
44-
configs:
45-
- source: traefik_dynamic_config.yml
46-
target: /etc/traefik/dynamic_conf.yml
47-
volumes:
48-
- /etc/traefik_certs:/etc/traefik_certs
3+
traefik:
4+
command:
5+
- "--api=true"
6+
- "--api.dashboard=true"
7+
- "--log.level=${OPS_TRAEFIK_LOGLEVEL}"
8+
- "--accesslog=false"
9+
- "--metrics.prometheus=true"
10+
- "--metrics.prometheus.addEntryPointsLabels=true"
11+
- "--metrics.prometheus.addServicesLabels=true"
12+
- "--entryPoints.metrics.address=:8082"
13+
- "--metrics.prometheus.entryPoint=metrics"
14+
- "--entryPoints.http.address=:80"
15+
- "--entrypoints.http.http.redirections.entrypoint.to=https"
16+
- "--entrypoints.http.http.redirections.entrypoint.scheme=https"
17+
- "--entrypoints.http.http.redirections.entrypoint.permanent=true"
18+
- "--entryPoints.http.transport.respondingTimeouts.idleTimeout=21600s" #6h, for https://github.com/traefik/traefik/issues/10805
19+
- "--entryPoints.http.transport.respondingTimeouts.writeTimeout=21600s" #6h, for https://github.com/traefik/traefik/issues/10805
20+
- "--entryPoints.http.transport.respondingTimeouts.readTimeout=21600s" #6h, for https://github.com/traefik/traefik/issues/10805
21+
- "--entryPoints.https.address=:443"
22+
- "--entryPoints.https.transport.respondingTimeouts.idleTimeout=21600s" #6h, for https://github.com/traefik/traefik/issues/10805
23+
- "--entryPoints.https.transport.respondingTimeouts.writeTimeout=21600s" #6h, for https://github.com/traefik/traefik/issues/10805
24+
- "--entryPoints.https.transport.respondingTimeouts.readTimeout=21600s" #6h, for https://github.com/traefik/traefik/issues/10805
25+
- "--entryPoints.smtp.address=:25"
26+
- "--entryPoints.postgres.address=:5432"
27+
- "--providers.swarm.endpoint=unix:///var/run/docker.sock"
28+
- "--providers.swarm.exposedByDefault=false"
29+
- "--core.defaultRuleSyntax=v2"
30+
- "--tracing=true"
31+
- "--tracing.addinternals"
32+
- "--tracing.otlp=true"
33+
- "--tracing.otlp.http=true"
34+
- "--providers.swarm.constraints=!LabelRegex(`io.simcore.zone`, `.+`)"
35+
- "--entryPoints.https.forwardedHeaders.insecure"
36+
- "--providers.file.directory=/etc/traefik/"
37+
- "--providers.file.watch=true"
38+
deploy:
39+
replicas: ${OPS_TRAEFIK_REPLICAS}
40+
placement:
41+
constraints:
42+
- node.labels.traefik==true
43+
configs:
44+
- source: traefik_dynamic_config.yml
45+
target: /etc/traefik/dynamic_conf.yml
46+
volumes:
47+
- /etc/traefik_certs:/etc/traefik_certs
4948

5049
configs:
51-
traefik_dynamic_config.yml:
52-
file: ./traefik_dynamic_config.yml
50+
traefik_dynamic_config.yml:
51+
file: ./traefik_dynamic_config.yml

0 commit comments

Comments
 (0)