Merge branch 'master' into fix/user-status

Author: pcrespov

Makefile

@@ -396,8 +396,8 @@ leave: ## Forces to stop all services, networks, etc by the node leaving the swa
 
 .PHONY: .init-swarm
 .init-swarm:
-	# Ensures swarm is initialized (careful we use a default pool of 10.20.0.0/16. Ensure you do not use private IPs in that range!)
-	$(if $(SWARM_HOSTS),,docker swarm init --advertise-addr=$(get_my_ip) --default-addr-pool 10.20.0.0/16)
+	# Ensures swarm is initialized (careful we use a default pool of 172.20.0.0/14. Ensure you do not use private IPs in that range!)
+	$(if $(SWARM_HOSTS),,docker swarm init --advertise-addr=$(get_my_ip) --default-addr-pool 172.20.0.0/14)
 
 
 ## DOCKER TAGS  -------------------------------

services/autoscaling/tests/manual/Makefile

@@ -39,5 +39,5 @@ down: .env ## stops local test app dependencies (running bare metal against AWS)
 SWARM_HOSTS = $(shell docker node ls --format="{{.Hostname}}" 2>$(if $(IS_WIN),NUL,/dev/null))
 .PHONY: .init-swarm
 .init-swarm:
-	# Ensures swarm is initialized
-	$(if $(SWARM_HOSTS),,docker swarm init --advertise-addr=$(get_my_ip))
+	# Ensures swarm is initialized (careful we use a default pool of 172.20.0.0/14. Ensure you do not use private IPs in that range!)
+	$(if $(SWARM_HOSTS),,docker swarm init --advertise-addr=$(get_my_ip) --default-addr-pool 172.20.0.0/14)

services/autoscaling/tests/manual/docker-compose-computational.yml

@@ -5,7 +5,6 @@ services:
       - DASK_MONITORING_URL=tcp://dask-scheduler:8786
       - DASK_SCHEDULER_AUTH='{}'
   dask-sidecar:
-    dns: 8.8.8.8 # needed to access internet
     image: itisfoundation/dask-sidecar:master-github-latest
     init: true
     hostname: "{{.Node.Hostname}}-{{.Service.Name}}"
@@ -31,7 +30,6 @@ services:
           - "node.role==worker"
 
   dask-scheduler:
-    dns: 8.8.8.8 # needed to access internet
     image: itisfoundation/dask-sidecar:master-github-latest
     init: true
     hostname: "{{.Node.Hostname}}-{{.Service.Name}}-{{.Task.Slot}}"

services/autoscaling/tests/manual/docker-compose.yml

@@ -35,7 +35,6 @@ services:
 
   autoscaling:
     image: local/autoscaling:development
-    dns: 8.8.8.8 # needed to access internet
     init: true
     hostname: "{{.Node.Hostname}}-{{.Service.Name}}-{{.Task.Slot}}"
     ports:

services/clusters-keeper/Makefile

@@ -17,8 +17,8 @@ down: .env ## stops local test app dependencies (running bare metal against AWS)
 
 PHONY: .init-swarm
 .init-swarm:
-	# Ensures swarm is initialized
-	$(if $(SWARM_HOSTS),,docker swarm init --advertise-addr=$(get_my_ip))
+	# Ensures swarm is initialized (careful we use a default pool of 172.20.0.0/14. Ensure you do not use private IPs in that range!)
+	$(if $(SWARM_HOSTS),,docker swarm init --advertise-addr=$(get_my_ip) --default-addr-pool 172.20.0.0/14)
 
 
 .PHONY: test-dask-scheduler-deploy

services/clusters-keeper/src/simcore_service_clusters_keeper/data/docker-compose.yml

@@ -2,7 +2,6 @@ version: "3.8"
 services:
   dask-scheduler:
     image: ${DOCKER_REGISTRY:-itisfoundation}/dask-sidecar:${DOCKER_IMAGE_TAG}
-    dns: 8.8.8.8 # needed to access internet from AWS
     init: true
     hostname: "{{.Node.Hostname}}-{{.Task.Slot}}"
     environment:
@@ -23,17 +22,16 @@ services:
     secrets:
       - source: dask_tls_ca
         target: ${DASK_TLS_CA_FILE}
-        mode: 0444
+        mode: 444
       - source: dask_tls_key
         target: ${DASK_TLS_KEY}
-        mode: 0444
+        mode: 444
       - source: dask_tls_cert
         target: ${DASK_TLS_CERT}
-        mode: 0444
+        mode: 444
 
   dask-sidecar:
     image: ${DOCKER_REGISTRY:-itisfoundation}/dask-sidecar:${DOCKER_IMAGE_TAG}
-    dns: 8.8.8.8 # needed to access internet from AWS
     init: true
     hostname: "{{.Node.Hostname}}-{{.Task.Slot}}"
     volumes:
@@ -62,17 +60,16 @@ services:
     secrets:
       - source: dask_tls_ca
         target: ${DASK_TLS_CA_FILE}
-        mode: 0444
+        mode: 444
       - source: dask_tls_key
         target: ${DASK_TLS_KEY}
-        mode: 0444
+        mode: 444
       - source: dask_tls_cert
         target: ${DASK_TLS_CERT}
-        mode: 0444
+        mode: 444
 
   autoscaling:
     image: ${DOCKER_REGISTRY:-itisfoundation}/autoscaling:${DOCKER_IMAGE_TAG}
-    dns: 8.8.8.8 # needed to access internet from AWS
     init: true
     hostname: "{{.Node.Hostname}}-{{.Task.Slot}}"
     environment:
@@ -106,18 +103,17 @@ services:
     secrets:
       - source: dask_tls_ca
         target: ${DASK_TLS_CA_FILE}
-        mode: 0444
+        mode: 444
       - source: dask_tls_key
         target: ${DASK_TLS_KEY}
-        mode: 0444
+        mode: 444
       - source: dask_tls_cert
         target: ${DASK_TLS_CERT}
-        mode: 0444
+        mode: 444
 
   redis:
     # NOTE: currently autoscaling requires redis to run
     image: "redis:6.2.6@sha256:4bed291aa5efb9f0d77b76ff7d4ab71eee410962965d052552db1fb80576431d"
-    dns: 8.8.8.8 # needed to access internet from AWS
     init: true
     hostname: "{{.Node.Hostname}}-{{.Task.Slot}}"
     healthcheck:
@@ -137,6 +133,7 @@ volumes:
     name: computational_shared_data
   redis-data:
 
+
 secrets:
   dask_tls_ca:
     file: ${DASK_TLS_CA_FILE}

services/clusters-keeper/src/simcore_service_clusters_keeper/utils/clusters.py

@@ -117,7 +117,8 @@ def create_startup_script(
             # NOTE: https://stackoverflow.com/questions/41203492/solving-redis-warnings-on-overcommit-memory-and-transparent-huge-pages-for-ubunt
             "sysctl vm.overcommit_memory=1",
             f"echo '{_docker_compose_yml_base64_encoded()}' | base64 -d > {_HOST_DOCKER_COMPOSE_PATH}",
-            "docker swarm init",
+            # NOTE: --default-addr-pool is necessary in order to prevent conflicts with AWS node IPs
+            "docker swarm init --default-addr-pool 172.20.0.0/14",
             f"{' '.join(environment_variables)} docker stack deploy --with-registry-auth --compose-file={_HOST_DOCKER_COMPOSE_PATH} dask_stack",
         ]
     )

services/osparc-gateway-server/Makefile

@@ -55,7 +55,7 @@ SWARM_HOSTS = $(shell docker node ls --format="{{.Hostname}}" 2>$(if $(IS_WIN),N
 PHONY: .init-swarm
 .init-swarm:
 	# Ensures swarm is initialized
-	$(if $(SWARM_HOSTS),,docker swarm init --advertise-addr=$(get_my_ip))
+	$(if $(SWARM_HOSTS),,docker swarm init --advertise-addr=$(get_my_ip) --default-addr-pool 172.20.0.0/14)
 
 .PHONY: config
 export OSPARC_GATEWAY_CONFIG_FILE_HOST = .osparc-dask-gateway-config.py