added EC2_INSTANCES_COLD_START_DOCKER_IMAGES_PRE_PULLING

Author: sanderegg

services/autoscaling/src/simcore_service_autoscaling/core/settings.py

@@ -3,10 +3,11 @@
 from typing import Annotated, Final, Self, cast
 
 from aws_library.ec2 import EC2InstanceBootSpecific, EC2Tags
+from common_library.basic_types import DEFAULT_FACTORY
 from fastapi import FastAPI
 from models_library.basic_types import LogLevel, PortInt, VersionTag
 from models_library.clusters import ClusterAuthentication
-from models_library.docker import DockerLabelKey
+from models_library.docker import DockerGenericTag, DockerLabelKey
 from pydantic import (
     AliasChoices,
     AnyUrl,
@@ -63,6 +64,14 @@ class EC2InstancesSettings(BaseCustomSettings):
         ),
     ]
 
+    EC2_INSTANCES_COLD_START_DOCKER_IMAGES_PRE_PULLING: Annotated[
+        list[DockerGenericTag],
+        Field(
+            description="List of docker images to pre-pull on cold started new EC2 instances",
+            default_factory=list,
+        ),
+    ] = DEFAULT_FACTORY
+
     EC2_INSTANCES_KEY_NAME: Annotated[
         str,
         Field(

services/clusters-keeper/src/simcore_service_clusters_keeper/core/settings.py

@@ -12,6 +12,7 @@
     VersionTag,
 )
 from models_library.clusters import ClusterAuthentication
+from models_library.docker import DockerGenericTag
 from pydantic import (
     AliasChoices,
     Field,
@@ -82,6 +83,13 @@ class WorkersEC2InstancesSettings(BaseCustomSettings):
             description="Defines which EC2 instances are considered as candidates for new EC2 instance and their respective boot specific parameters",
         ),
     ]
+    WORKERS_EC2_INSTANCES_COLD_START_DOCKER_IMAGES_PRE_PULLING: Annotated[
+        list[DockerGenericTag],
+        Field(
+            description="List of docker images to pre-pull on cold started new EC2 instances",
+            default_factory=list,
+        ),
+    ] = DEFAULT_FACTORY
 
     WORKERS_EC2_INSTANCES_KEY_NAME: Annotated[
         str,
@@ -170,7 +178,6 @@ class PrimaryEC2InstancesSettings(BaseCustomSettings):
             description="Defines which EC2 instances are considered as candidates for new EC2 instance and their respective boot specific parameters",
         ),
     ]
-
     PRIMARY_EC2_INSTANCES_MAX_INSTANCES: Annotated[
         int,
         Field(

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

@@ -104,6 +104,7 @@ services:
       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}
+      EC2_INSTANCES_COLD_START_DOCKER_IMAGES_PRE_PULLING: ${WORKERS_EC2_INSTANCES_COLD_START_DOCKER_IMAGES_PRE_PULLING}
       EC2_INSTANCES_CUSTOM_TAGS: ${WORKERS_EC2_INSTANCES_CUSTOM_TAGS}
       EC2_INSTANCES_ATTACHED_IAM_PROFILE: ""
       EC2_INSTANCES_KEY_NAME: ${WORKERS_EC2_INSTANCES_KEY_NAME}

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

@@ -99,6 +99,7 @@ def _convert_to_env_dict(entries: dict[str, Any]) -> str:
         f"EC2_INSTANCES_NAME_PREFIX={cluster_machines_name_prefix}",
         f"LOG_LEVEL={app_settings.log_level}",
         f"WORKERS_EC2_INSTANCES_ALLOWED_TYPES={_convert_to_env_dict(app_settings.CLUSTERS_KEEPER_WORKERS_EC2_INSTANCES.WORKERS_EC2_INSTANCES_ALLOWED_TYPES)}",
+        f"WORKERS_EC2_INSTANCES_COLD_START_DOCKER_IMAGES_PRE_PULLING={_convert_to_env_list(app_settings.CLUSTERS_KEEPER_WORKERS_EC2_INSTANCES.WORKERS_EC2_INSTANCES_COLD_START_DOCKER_IMAGES_PRE_PULLING)}",
         f"WORKERS_EC2_INSTANCES_CUSTOM_TAGS={_convert_to_env_dict(app_settings.CLUSTERS_KEEPER_WORKERS_EC2_INSTANCES.WORKERS_EC2_INSTANCES_CUSTOM_TAGS | additional_custom_tags)}",
         f"WORKERS_EC2_INSTANCES_KEY_NAME={app_settings.CLUSTERS_KEEPER_WORKERS_EC2_INSTANCES.WORKERS_EC2_INSTANCES_KEY_NAME}",
         f"WORKERS_EC2_INSTANCES_MAX_INSTANCES={app_settings.CLUSTERS_KEEPER_WORKERS_EC2_INSTANCES.WORKERS_EC2_INSTANCES_MAX_INSTANCES}",

services/docker-compose.yml

@@ -131,6 +131,7 @@ services:
 
       AUTOSCALING_EC2_INSTANCES: ${AUTOSCALING_EC2_INSTANCES} # used to enable/disable
       EC2_INSTANCES_ALLOWED_TYPES: ${EC2_INSTANCES_ALLOWED_TYPES}
+      EC2_INSTANCES_COLD_START_DOCKER_IMAGES_PRE_PULLING: ${EC2_INSTANCES_COLD_START_DOCKER_IMAGES_PRE_PULLING}
       EC2_INSTANCES_MACHINES_BUFFER: ${EC2_INSTANCES_MACHINES_BUFFER}
       EC2_INSTANCES_MAX_INSTANCES: ${EC2_INSTANCES_MAX_INSTANCES}
       EC2_INSTANCES_MAX_START_TIME: ${EC2_INSTANCES_MAX_START_TIME}