From cf5da3f8dda71452bcb121c0b9f3a31f24b61f20 Mon Sep 17 00:00:00 2001 From: Pim Kunis Date: Sun, 16 Jul 2023 12:06:49 +0200 Subject: [PATCH] remove constraints on docker service placement --- ansible/roles/cyberchef/docker-stack.yml.j2 | 3 --- ansible/roles/inbucket/docker-stack.yml.j2 | 3 --- ansible/roles/jitsi/docker-stack.yml.j2 | 15 --------------- ansible/roles/kms/docker-stack.yml.j2 | 4 ---- ansible/roles/mastodon/docker-stack.yml.j2 | 14 -------------- ansible/roles/overleaf/docker-stack.yml.j2 | 11 ----------- ansible/roles/seafile/docker-stack.yml.j2 | 11 ----------- ansible/roles/shephard/docker-stack.yml.j2 | 1 + 8 files changed, 1 insertion(+), 61 deletions(-) diff --git a/ansible/roles/cyberchef/docker-stack.yml.j2 b/ansible/roles/cyberchef/docker-stack.yml.j2 index 1219f45..209b2b3 100644 --- a/ansible/roles/cyberchef/docker-stack.yml.j2 +++ b/ansible/roles/cyberchef/docker-stack.yml.j2 @@ -11,9 +11,6 @@ services: networks: - traefik deploy: - placement: - constraints: - - "node.labels.public == true" labels: - traefik.enable=true - traefik.http.routers.cyberchef.entrypoints=websecure diff --git a/ansible/roles/inbucket/docker-stack.yml.j2 b/ansible/roles/inbucket/docker-stack.yml.j2 index 6e400da..6dec761 100644 --- a/ansible/roles/inbucket/docker-stack.yml.j2 +++ b/ansible/roles/inbucket/docker-stack.yml.j2 @@ -13,9 +13,6 @@ services: ports: - 2500:2500 deploy: - placement: - constraints: - - "node.labels.public == true" labels: - traefik.enable=true - traefik.http.routers.inbucket.entrypoints=localsecure diff --git a/ansible/roles/jitsi/docker-stack.yml.j2 b/ansible/roles/jitsi/docker-stack.yml.j2 index 127b346..0eaa9ac 100644 --- a/ansible/roles/jitsi/docker-stack.yml.j2 +++ b/ansible/roles/jitsi/docker-stack.yml.j2 @@ -21,9 +21,6 @@ services: - jitsi - traefik deploy: - placement: - constraints: - - "node.labels.public == true" labels: - traefik.enable=true - traefik.http.routers.jitsi-web.entrypoints=websecure @@ -57,10 +54,6 @@ services: jitsi: aliases: - xmpp.meet.jitsi - deploy: - placement: - constraints: - - "node.labels.public == true" jicofo: image: jitsi/jicofo:stable-8218 @@ -74,10 +67,6 @@ services: - prosody networks: - jitsi - deploy: - placement: - constraints: - - "node.labels.public == true" jvb: image: jitsi/jvb:stable-8218 @@ -96,7 +85,3 @@ services: networks: - jitsi - traefik - deploy: - placement: - constraints: - - "node.labels.public == true" diff --git a/ansible/roles/kms/docker-stack.yml.j2 b/ansible/roles/kms/docker-stack.yml.j2 index 9511e1d..aeb7460 100644 --- a/ansible/roles/kms/docker-stack.yml.j2 +++ b/ansible/roles/kms/docker-stack.yml.j2 @@ -6,7 +6,3 @@ services: image: teddysun/kms ports: - 1688:1688 - deploy: - placement: - constraints: - - "node.labels.public == true" diff --git a/ansible/roles/mastodon/docker-stack.yml.j2 b/ansible/roles/mastodon/docker-stack.yml.j2 index 1c43f9c..c00ecd9 100644 --- a/ansible/roles/mastodon/docker-stack.yml.j2 +++ b/ansible/roles/mastodon/docker-stack.yml.j2 @@ -33,10 +33,6 @@ services: target: /data volume: nocopy: true - deploy: - placement: - constraints: - - "node.labels.mastodon == true" web: image: tootsuite/mastodon:v4.1 @@ -69,9 +65,6 @@ services: volume: nocopy: true deploy: - placement: - constraints: - - "node.labels.mastodon == true" labels: - traefik.enable=true - traefik.http.routers.mastodon.entrypoints=websecure @@ -101,9 +94,6 @@ services: # prettier-ignore test: ['CMD-SHELL', 'wget -q --spider --proxy=off localhost:4000/api/v1/streaming/health || exit 1'] deploy: - placement: - constraints: - - "node.labels.mastodon == true" labels: - traefik.enable=true - traefik.http.routers.mastodon-streaming.entrypoints=websecure @@ -137,9 +127,5 @@ services: nocopy: true healthcheck: test: ['CMD-SHELL', "ps aux | grep '[s]idekiq\ 6' || false"] - deploy: - placement: - constraints: - - "node.labels.mastodon == true" depends_on: - redis diff --git a/ansible/roles/overleaf/docker-stack.yml.j2 b/ansible/roles/overleaf/docker-stack.yml.j2 index 5c446b1..76904a8 100644 --- a/ansible/roles/overleaf/docker-stack.yml.j2 +++ b/ansible/roles/overleaf/docker-stack.yml.j2 @@ -39,9 +39,6 @@ services: volume: nocopy: true deploy: - placement: - constraints: - - "node.labels.overleaf == true" labels: - traefik.enable=true - traefik.http.routers.overleaf.entrypoints=websecure @@ -100,10 +97,6 @@ services: interval: 10s timeout: 10s retries: 5 - deploy: - placement: - constraints: - - "node.labels.overleaf == true" overleaf-redis: image: redis:5 @@ -117,7 +110,3 @@ services: target: /data volume: nocopy: true - deploy: - placement: - constraints: - - "node.labels.overleaf == true" diff --git a/ansible/roles/seafile/docker-stack.yml.j2 b/ansible/roles/seafile/docker-stack.yml.j2 index deb7911..7886247 100644 --- a/ansible/roles/seafile/docker-stack.yml.j2 +++ b/ansible/roles/seafile/docker-stack.yml.j2 @@ -32,20 +32,12 @@ services: nocopy: true networks: - seafile - deploy: - placement: - constraints: - - "node.labels.seafile == true" memcached: image: memcached:1.6 entrypoint: memcached -m 256 networks: - seafile - deploy: - placement: - constraints: - - "node.labels.seafile == true" seafile: image: seafileltd/seafile-mc:9.0.10 @@ -64,9 +56,6 @@ services: - SEAFILE_SERVER_LETSENCRYPT=false - SEAFILE_SERVER_HOSTNAME={{ seafile_domain }} deploy: - placement: - constraints: - - "node.labels.seafile == true" labels: - traefik.enable=true - traefik.http.routers.seafile.entrypoints=websecure diff --git a/ansible/roles/shephard/docker-stack.yml.j2 b/ansible/roles/shephard/docker-stack.yml.j2 index 832cf0e..2ac91e8 100644 --- a/ansible/roles/shephard/docker-stack.yml.j2 +++ b/ansible/roles/shephard/docker-stack.yml.j2 @@ -1,3 +1,4 @@ +# vi: ft=yaml version: "3" networks: