From 9e0980eb7a472549749604a927c21a4c899e73d8 Mon Sep 17 00:00:00 2001 From: matusdrobuliak66 Date: Mon, 3 Jun 2024 15:42:50 +0200 Subject: [PATCH 1/2] mount efs to efs-guardian --- .../simcore/docker-compose.deploy.aws.yml | 11 ++++++++ services/simcore/docker-compose.yml | 28 +++++++++++++++++++ 2 files changed, 39 insertions(+) diff --git a/services/simcore/docker-compose.deploy.aws.yml b/services/simcore/docker-compose.deploy.aws.yml index 79044669..ed3a8a4c 100644 --- a/services/simcore/docker-compose.deploy.aws.yml +++ b/services/simcore/docker-compose.deploy.aws.yml @@ -7,6 +7,10 @@ services: placement: constraints: - node.role == worker + efs-guardian: + volumes: + - efs_volume:/data/efs + clusters-keeper: deploy: replicas: 1 @@ -58,3 +62,10 @@ services: payments: deploy: replicas: 1 + +volumes: + efs_volume: + driver_opts: + type: nfs + o: addr=${EFS_DNS_NAME},rw,nfsvers=4.1,rsize=1048576,wsize=1048576,hard,timeo=600,retrans=2,noresvport + device: :/ diff --git a/services/simcore/docker-compose.yml b/services/simcore/docker-compose.yml index 0acc4994..c297df37 100644 --- a/services/simcore/docker-compose.yml +++ b/services/simcore/docker-compose.yml @@ -532,6 +532,34 @@ services: memory: 128M cpus: '0.1' + efs-guardian: + networks: + - monitored + - public + hostname: "{{.Service.Name}}" + deploy: + replicas: ${SIMCORE_EFS_GUARDIAN_REPLICAS} + update_config: + parallelism: 2 + order: start-first + failure_action: continue + delay: 10s + restart_policy: + condition: any + delay: 5s + max_attempts: 3 + window: 120s + placement: + constraints: + - node.labels.simcore==true + resources: + limits: + memory: 256M + cpus: '0.5' + reservations: + memory: 64M + cpus: '0.1' + migration: deploy: resources: From f96be5573c65fe1fc7929233d4d8248a211e8108 Mon Sep 17 00:00:00 2001 From: matusdrobuliak66 Date: Mon, 3 Jun 2024 16:01:51 +0200 Subject: [PATCH 2/2] review @sanderegg --- services/simcore/docker-compose.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/services/simcore/docker-compose.yml b/services/simcore/docker-compose.yml index c297df37..b8e52bc3 100644 --- a/services/simcore/docker-compose.yml +++ b/services/simcore/docker-compose.yml @@ -533,9 +533,6 @@ services: cpus: '0.1' efs-guardian: - networks: - - monitored - - public hostname: "{{.Service.Name}}" deploy: replicas: ${SIMCORE_EFS_GUARDIAN_REPLICAS}