From b4c2899071b5e3b2e8746d4b91ed80418171aee5 Mon Sep 17 00:00:00 2001
From: Bernhard Mallinger <bernhard.mallinger@eox.at>
Date: Tue, 18 Jan 2022 13:03:24 +0100
Subject: [PATCH] Set role constraints for services also for staging
This reduces the differences compared to ops
---
vs_starter/templates/docker-compose.instance.yml | 8 --------
1 file changed, 8 deletions(-)
diff --git a/vs_starter/templates/docker-compose.instance.yml b/vs_starter/templates/docker-compose.instance.yml
index 0a178e1..2ae1987 100644
--- a/vs_starter/templates/docker-compose.instance.yml
+++ b/vs_starter/templates/docker-compose.instance.yml
@@ -176,29 +176,23 @@ services:
{%- if environment == "staging" %}
UPLOAD_CONTAINER: "{{slug}}-data-staging"
{%- endif %}
-{%- if environment == "ops" %}
deploy:
replicas: 1
placement:
constraints: [node.role == manager]
-{%- endif %}
ingestor:
image: registry.gitlab.eox.at/esa/prism/vs/pvs_ingestor{{release_version}} # bumpversion
environment:
REDIS_PREPROCESS_MD_QUEUE_KEY: "preprocess_queue"
INOTIFY_MASKS: "IN_MOVED_TO"
-{%- if environment == "ops" %}
deploy:
placement:
constraints: [node.role == manager]
-{%- endif %}
sftp:
image: registry.gitlab.eox.at/esa/prism/vs/pvs_sftp{{release_version}} # bumpversion
-{%- if environment == "ops" %}
deploy:
placement:
constraints: [node.role == manager]
-{%- endif %}
configs:
- source: sftp_ssh_host_rsa_key
target: /etc/ssh/ssh_host_rsa_key
@@ -283,10 +277,8 @@ services:
target: SHIB_KEY
deploy:
replicas: 1
-{%- if environment == "ops" %}
placement:
constraints: [node.role == manager]
-{%- endif %}
labels:
# router for basic auth based access (https)
- "traefik.http.routers.{{slug}}-shibauth.rule=Host(`sso.{{slug}}.pass.copernicus.eu`) && PathPrefix(`/Shibboleth.sso`)"
--
GitLab