✨Clusters-keeper: add CLUSTERS_KEEPER_COMPUTATIONAL_BACKEND_DOCKER_IMAGE_TAG ENV (#5066)

Author: sanderegg

.env-devel

@@ -31,6 +31,7 @@ CATALOG_DEV_FEATURES_ENABLED=0
 CATALOG_SERVICES_DEFAULT_RESOURCES='{"CPU": {"limit": 0.1, "reservation": 0.1}, "RAM": {"limit": 2147483648, "reservation": 2147483648}}'
 CATALOG_SERVICES_DEFAULT_SPECIFICATIONS='{}'
 
+CLUSTERS_KEEPER_COMPUTATIONAL_BACKEND_DOCKER_IMAGE_TAG=master-github-latest
 CLUSTERS_KEEPER_EC2_ACCESS=null
 CLUSTERS_KEEPER_MAX_MISSED_HEARTBEATS_BEFORE_CLUSTER_TERMINATION=5
 CLUSTERS_KEEPER_PRIMARY_EC2_INSTANCES=null

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

@@ -225,8 +225,8 @@ class ApplicationSettings(BaseCustomSettings, MixinLoggingSettings):
     )
 
     CLUSTERS_KEEPER_COMPUTATIONAL_BACKEND_DOCKER_IMAGE_TAG: str = Field(
-        default="master-github-latest",
-        description="defines the image tag to use for the computational backend",
+        ...,
+        description="defines the image tag to use for the computational backend sidecar image (NOTE: it currently defaults to use itisfoundation organisation in Dockerhub)",
     )
 
     SWARM_STACK_NAME: str = Field(

services/clusters-keeper/tests/unit/test_cli.py

@@ -3,16 +3,13 @@
 # pylint:disable=redefined-outer-name
 
 
-import pytest
-from faker import Faker
 from simcore_service_clusters_keeper.cli import main
 from typer.testing import CliRunner
 
 runner = CliRunner()
 
 
-def test_settings(monkeypatch: pytest.MonkeyPatch, faker: Faker):
-    monkeypatch.setenv("SWARM_STACK_NAME", faker.pystr())
+def test_settings(app_environment):
     result = runner.invoke(main, ["settings"])
     assert result.exit_code == 0
     assert "APP_NAME=simcore-service-clusters-keeper" in result.stdout

services/docker-compose.yml

@@ -116,6 +116,7 @@ services:
     networks:
       - default
     environment:
+      - CLUSTERS_KEEPER_COMPUTATIONAL_BACKEND_DOCKER_IMAGE_TAG=${CLUSTERS_KEEPER_COMPUTATIONAL_BACKEND_DOCKER_IMAGE_TAG}
       - CLUSTERS_KEEPER_MAX_MISSED_HEARTBEATS_BEFORE_CLUSTER_TERMINATION=${CLUSTERS_KEEPER_MAX_MISSED_HEARTBEATS_BEFORE_CLUSTER_TERMINATION}
       - CLUSTERS_KEEPER_TASK_INTERVAL=${CLUSTERS_KEEPER_TASK_INTERVAL}
       - CLUSTERS_KEEPER_LOGLEVEL=${LOG_LEVEL:-WARNING}