pass autoscaling rabbitmq directly as json

Author: sanderegg

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

@@ -91,6 +91,7 @@ services:
       AUTOSCALING_EC2_SECRET_ACCESS_KEY: ${CLUSTERS_KEEPER_EC2_SECRET_ACCESS_KEY}
       AUTOSCALING_NODES_MONITORING: null
       AUTOSCALING_POLL_INTERVAL: 00:00:10
+      AUTOSCALING_RABBITMQ: ${AUTOSCALING_RABBITMQ}
       DASK_MONITORING_URL: tls://dask-scheduler:8786
       DASK_SCHEDULER_AUTH: '{"type":"tls","tls_ca_file":"${DASK_TLS_CA_FILE}","tls_client_cert":"${DASK_TLS_CERT}","tls_client_key":"${DASK_TLS_KEY}"}'
       EC2_INSTANCES_ALLOWED_TYPES: ${WORKERS_EC2_INSTANCES_ALLOWED_TYPES}
@@ -106,11 +107,6 @@ services:
       EC2_INSTANCES_TIME_BEFORE_TERMINATION: ${WORKERS_EC2_INSTANCES_TIME_BEFORE_TERMINATION}
       LOG_FORMAT_LOCAL_DEV_ENABLED: 1
       LOG_LEVEL: ${LOG_LEVEL:-WARNING}
-      RABBIT_HOST: ${RABBIT_HOST}
-      RABBIT_PASSWORD: ${RABBIT_PASSWORD}
-      RABBIT_PORT: ${RABBIT_PORT}
-      RABBIT_SECURE: ${RABBIT_SECURE}
-      RABBIT_USER: ${RABBIT_USER}
       REDIS_HOST: redis
       REDIS_PORT: 6379
     volumes:

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

@@ -102,6 +102,7 @@ def _convert_to_env_dict(entries: dict[str, Any]) -> str:
         f"WORKERS_EC2_INSTANCES_SUBNET_ID={app_settings.CLUSTERS_KEEPER_WORKERS_EC2_INSTANCES.WORKERS_EC2_INSTANCES_SUBNET_ID}",
         f"WORKERS_EC2_INSTANCES_TIME_BEFORE_DRAINING={app_settings.CLUSTERS_KEEPER_WORKERS_EC2_INSTANCES.WORKERS_EC2_INSTANCES_TIME_BEFORE_DRAINING}",
         f"WORKERS_EC2_INSTANCES_TIME_BEFORE_TERMINATION={app_settings.CLUSTERS_KEEPER_WORKERS_EC2_INSTANCES.WORKERS_EC2_INSTANCES_TIME_BEFORE_TERMINATION}",
+        f"AUTOSCALING_RABBITMQ={app_settings.CLUSTERS_KEEPER_RABBITMQ.model_dump_json() if app_settings.CLUSTERS_KEEPER_RABBITMQ else 'null'}",
     ]
 
 

services/docker-compose.yml

@@ -220,6 +220,7 @@ services:
       PRIMARY_EC2_INSTANCES_PROMETHEUS_PASSWORD: ${PRIMARY_EC2_INSTANCES_PROMETHEUS_PASSWORD}
       PRIMARY_EC2_INSTANCES_MAX_START_TIME: ${PRIMARY_EC2_INSTANCES_MAX_START_TIME}
       PRIMARY_EC2_INSTANCES_DOCKER_DEFAULT_ADDRESS_POOL: ${PRIMARY_EC2_INSTANCES_DOCKER_DEFAULT_ADDRESS_POOL}
+      PRIMARY_EC2_INSTANCES_RABBIT_SETTINGS: ${PRIMARY_EC2_INSTANCES_RABBIT_SETTINGS}
       RABBIT_HOST: ${RABBIT_HOST}
       RABBIT_PASSWORD: ${RABBIT_PASSWORD}
       RABBIT_PORT: ${RABBIT_PORT}