removed crontab

Author: sanderegg

services/autoscaling/src/simcore_service_autoscaling/utils/cluster_scaling.py

@@ -62,9 +62,10 @@ async def ec2_startup_script(
             join_as_drained=app_settings.AUTOSCALING_DOCKER_JOIN_DRAINED
         )
     )
+    assert app_settings.AUTOSCALING_EC2_INSTANCES  # nosec
     if app_settings.AUTOSCALING_REGISTRY:  # noqa: SIM102
         if pull_image_cmd := utils_docker.get_docker_pull_images_on_start_bash_command(
-            ec2_boot_specific.pre_pull_images
+            app_settings.AUTOSCALING_EC2_INSTANCES.EC2_INSTANCES_COLD_START_DOCKER_IMAGES_PRE_PULLING
         ):
             startup_commands.append(
                 " && ".join(
@@ -76,11 +77,6 @@ async def ec2_startup_script(
                     ]
                 )
             )
-            startup_commands.append(
-                utils_docker.get_docker_pull_images_crontab(
-                    ec2_boot_specific.pre_pull_images_cron_interval
-                ),
-            )
 
     return " && ".join(startup_commands)
 

services/autoscaling/src/simcore_service_autoscaling/utils/utils_docker.py

@@ -490,23 +490,6 @@ def get_docker_pull_images_on_start_bash_command(
     )
 
 
-def get_docker_pull_images_crontab(interval: datetime.timedelta) -> str:
-    # check the interval is within 1 < 60 minutes
-    checked_interval = round(interval.total_seconds() / 60)
-
-    crontab_entry = " ".join(
-        [
-            "echo",
-            f'"*/{checked_interval or 1} * * * * root',
-            f"{_DOCKER_COMPOSE_PULL_SCRIPT_PATH}",
-            f'>> {_CRONJOB_LOGS_PATH} 2>&1"',
-            ">>",
-            "/etc/crontab",
-        ]
-    )
-    return " && ".join([crontab_entry])
-
-
 async def find_node_with_name(
     docker_client: AutoscalingDocker, name: str
 ) -> Node | None:

services/autoscaling/tests/unit/test_utils_docker.py

@@ -54,7 +54,6 @@
     compute_tasks_needed_resources,
     find_node_with_name,
     get_docker_login_on_start_bash_command,
-    get_docker_pull_images_crontab,
     get_docker_pull_images_on_start_bash_command,
     get_docker_swarm_join_bash_command,
     get_max_resources_from_docker_task,
@@ -1078,34 +1077,6 @@ def test_get_docker_pull_images_on_start_bash_command(
     assert get_docker_pull_images_on_start_bash_command(images) == expected_cmd
 
 
-@pytest.mark.parametrize(
-    "interval, expected_cmd",
-    [
-        (
-            datetime.timedelta(minutes=20),
-            'echo "*/20 * * * * root /docker-pull-script.sh >> /var/log/docker-pull-cronjob.log 2>&1" >> /etc/crontab',
-        ),
-        (
-            datetime.timedelta(seconds=20),
-            'echo "*/1 * * * * root /docker-pull-script.sh >> /var/log/docker-pull-cronjob.log 2>&1" >> /etc/crontab',
-        ),
-        (
-            datetime.timedelta(seconds=200),
-            'echo "*/3 * * * * root /docker-pull-script.sh >> /var/log/docker-pull-cronjob.log 2>&1" >> /etc/crontab',
-        ),
-        (
-            datetime.timedelta(days=3),
-            'echo "*/4320 * * * * root /docker-pull-script.sh >> /var/log/docker-pull-cronjob.log 2>&1" >> /etc/crontab',
-        ),
-    ],
-    ids=str,
-)
-def test_get_docker_pull_images_crontab(
-    interval: datetime.timedelta, expected_cmd: str
-):
-    assert get_docker_pull_images_crontab(interval) == expected_cmd
-
-
 def test_is_node_ready_and_available(create_fake_node: Callable[..., Node]):
     # check not ready state return false
     for node_status in [