Merge remote-tracking branch 'upstream/main' into monitoring-rolling-config-update

Author: YuryHrytsuk

services/portainer/Makefile

@@ -95,6 +95,7 @@ ${TEMP_COMPOSE}-aws: docker-compose.yml docker-compose.aws.yml .env
 secrets: .env ## Construct secrets for portainer pwd, to change pwd it need to be done manually https://git.speag.com/oSparc/osparc-ops-deployment-configuration/-/wikis/Update-Portainer-Password
 	@if [ -z $(IS_PORTAINER_SERVICE_RUNNING) ]; then\
 		echo "Setting portainer_admin_password (can only set but not update password!)" \
+		&& echo "To update password follow https://portal.portainer.io/knowledge/how-do-i-reset-my-portainer-password" \
 		&& docker secret rm portainer_admin_password 2>/dev/null; \
 		set -o allexport; source .env; set +o allexport; \
 		echo -n "$${PORTAINER_ADMIN_PWD}" | docker secret create portainer_admin_password -  2>/dev/null; \

services/simcore/docker-compose.yml.j2

@@ -382,9 +382,9 @@ services:
     deploy:
       replicas: ${SIMCORE_STO_WORKER_REPLICAS}
       update_config:
-        parallelism: 2
+        parallelism: 1
         order: start-first
-        failure_action: continue
+        failure_action: rollback
         delay: 10s
       placement:
         constraints:
@@ -397,6 +397,27 @@ services:
           cpus: "1"
           memory: "700M"
 
+  sto-worker-cpu-bound:
+    networks:
+      - monitored
+    deploy:
+      replicas: ${SIMCORE_STO_WORKER_CPU_BOUND_REPLICAS}
+      update_config:
+        parallelism: 1
+        order: start-first
+        failure_action: rollback
+        delay: 10s
+      placement:
+        constraints:
+          - node.labels.simcore==true
+      resources:
+        reservations:
+          cpus: "0.1"
+          memory: "200M"
+        limits:
+          cpus: "1"
+          memory: "1G"
+
   director:
     # Certificate necessary for local deploiement only
     #secrets: