♻️ director-v2 no longer captures all env vars (#5082)

Co-authored-by: Andrei Neagu <[email protected]>

Author: GitHK

.env-devel

@@ -194,6 +194,8 @@ DIRECTOR_PORT=8080
 
 DIRECTOR_V2_HOST=director-v2
 DIRECTOR_V2_PORT=8000
+DIRECTOR_V2_SERVICES_CUSTOM_CONSTRAINTS=[]
+DYNAMIC_SIDECAR_ENABLE_VOLUME_LIMITS=False
 
 WEBSERVER_DIAGNOSTICS={}
 DIAGNOSTICS_MAX_AVG_LATENCY=10

services/director-v2/.env-devel

@@ -10,7 +10,6 @@ SC_BOOT_MODE=debug-ptvsd
 
 
 # Variables typically passed upon start via services/docker-compose.yml files
-EXTRA_HOSTS_SUFFIX=undefined
 
 DYNAMIC_SIDECAR_IMAGE=local/dynamic-sidecar:development
 DYNAMIC_SIDECAR_PROMETHEUS_SERVICE_LABELS={}

services/director-v2/src/simcore_service_director_v2/core/dynamic_services_settings/scheduler.py

@@ -160,11 +160,3 @@ class DynamicServicesSchedulerSettings(BaseCustomSettings):
     DYNAMIC_SIDECAR_DOCKER_NODE_CONCURRENT_RESOURCE_SLOTS: PositiveInt = Field(
         2, description="Amount of slots per resource on a node"
     )
-
-    DYNAMIC_SIDECAR_DOCKER_NODE_SAVES_LOCK_TIMEOUT_S: PositiveFloat = Field(
-        10,
-        description=(
-            "Lifetime of the lock. Allows the system to recover a lock "
-            "in case of crash, the lock will expire and result as released."
-        ),
-    )

services/director-v2/src/simcore_service_director_v2/core/settings.py

@@ -157,21 +157,19 @@ class AppSettings(BaseCustomSettings, MixinLoggingSettings):
 
     # for passing self-signed certificate to spawned services
     DIRECTOR_V2_SELF_SIGNED_SSL_SECRET_ID: str = Field(
-        "",
+        default="",
         description="ID of the docker secret containing the self-signed certificate",
     )
     DIRECTOR_V2_SELF_SIGNED_SSL_SECRET_NAME: str = Field(
-        "",
+        default="",
         description="Name of the docker secret containing the self-signed certificate",
     )
     DIRECTOR_V2_SELF_SIGNED_SSL_FILENAME: str = Field(
-        "",
+        default="",
         description="Filepath to self-signed osparc.crt file *as mounted inside the container*, empty strings disables it",
     )
 
     # extras
-    EXTRA_HOSTS_SUFFIX: str = Field("undefined", env="EXTRA_HOSTS_SUFFIX")
-    PUBLISHED_HOSTS_NAME: str = Field("", env="PUBLISHED_HOSTS_NAME")
     SWARM_STACK_NAME: str = Field("undefined-please-check", env="SWARM_STACK_NAME")
     SERVICE_TRACKING_HEARTBEAT: datetime.timedelta = Field(
         default=DEFAULT_RESOURCE_USAGE_HEARTBEAT_INTERVAL,
@@ -193,12 +191,6 @@ class AppSettings(BaseCustomSettings, MixinLoggingSettings):
         description="forwarded to sidecars which use nodeports",
     )
 
-    # monitoring
-    MONITORING_ENABLED: bool = False
-
-    # fastappi app settings
-    DIRECTOR_V2_DEBUG: bool = False
-
     # ptvsd settings
     DIRECTOR_V2_REMOTE_DEBUG_PORT: PortInt = PortInt(3000)
 

services/docker-compose.yml

@@ -202,38 +202,62 @@ services:
     init: true
     hostname: "{{.Node.Hostname}}-{{.Service.Name}}-{{.Task.Slot}}"
     environment:
-      - CATALOG_HOST=${CATALOG_HOST:-catalog}
-      - CATALOG_PORT=${CATALOG_PORT:-8000}
-      - COMPUTATIONAL_BACKEND_DEFAULT_CLUSTER_URL=${COMPUTATIONAL_BACKEND_DEFAULT_CLUSTER_URL:-tcp://dask-scheduler:8786}
+      - CATALOG_HOST=${CATALOG_HOST}
+      - CATALOG_PORT=${CATALOG_PORT}
       - COMPUTATIONAL_BACKEND_DEFAULT_CLUSTER_FILE_LINK_TYPE=${COMPUTATIONAL_BACKEND_DEFAULT_CLUSTER_FILE_LINK_TYPE}
+      - COMPUTATIONAL_BACKEND_DEFAULT_CLUSTER_URL=${COMPUTATIONAL_BACKEND_DEFAULT_CLUSTER_URL}
       - COMPUTATIONAL_BACKEND_DEFAULT_FILE_LINK_TYPE=${COMPUTATIONAL_BACKEND_DEFAULT_FILE_LINK_TYPE}
       - COMPUTATIONAL_BACKEND_ON_DEMAND_CLUSTERS_FILE_LINK_TYPE=${COMPUTATIONAL_BACKEND_ON_DEMAND_CLUSTERS_FILE_LINK_TYPE}
-      - DIRECTOR_HOST=${DIRECTOR_HOST:-director}
-      - DIRECTOR_PORT=${DIRECTOR_PORT:-8080}
+      - DIRECTOR_HOST=${DIRECTOR_HOST}
+      - DIRECTOR_PORT=${DIRECTOR_PORT}
       - DIRECTOR_SELF_SIGNED_SSL_FILENAME=${DIRECTOR_SELF_SIGNED_SSL_FILENAME}
       - DIRECTOR_SELF_SIGNED_SSL_SECRET_ID=${DIRECTOR_SELF_SIGNED_SSL_SECRET_ID}
       - DIRECTOR_SELF_SIGNED_SSL_SECRET_NAME=${DIRECTOR_SELF_SIGNED_SSL_SECRET_NAME}
       - DIRECTOR_SERVICES_CUSTOM_CONSTRAINTS=${DIRECTOR_SERVICES_CUSTOM_CONSTRAINTS}
       - DIRECTOR_V2_DEV_FEATURES_ENABLED=${DIRECTOR_V2_DEV_FEATURES_ENABLED}
-      - DYNAMIC_SIDECAR_IMAGE=${DOCKER_REGISTRY:-itisfoundation}/dynamic-sidecar:${DOCKER_IMAGE_TAG:-latest}
-      - EXTRA_HOSTS_SUFFIX=${EXTRA_HOSTS_SUFFIX:-undefined}
-      - LOG_LEVEL=${LOG_LEVEL:-WARNING}
+      - DIRECTOR_V2_SERVICES_CUSTOM_CONSTRAINTS=${DIRECTOR_V2_SERVICES_CUSTOM_CONSTRAINTS}
+      - DYNAMIC_SIDECAR_ENABLE_VOLUME_LIMITS=${DYNAMIC_SIDECAR_ENABLE_VOLUME_LIMITS}
+      - DYNAMIC_SIDECAR_IMAGE=${DYNAMIC_SIDECAR_IMAGE}
+      - DYNAMIC_SIDECAR_LOG_LEVEL=${DYNAMIC_SIDECAR_LOG_LEVEL}
+      - DYNAMIC_SIDECAR_PROMETHEUS_MONITORING_NETWORKS=${DYNAMIC_SIDECAR_PROMETHEUS_MONITORING_NETWORKS}
+      - DYNAMIC_SIDECAR_PROMETHEUS_SERVICE_LABELS=${DYNAMIC_SIDECAR_PROMETHEUS_SERVICE_LABELS}
       - LOG_FORMAT_LOCAL_DEV_ENABLED=${LOG_FORMAT_LOCAL_DEV_ENABLED}
+      - LOG_LEVEL=${LOG_LEVEL:-WARNING}
+      - MONITORING_ENABLED=${MONITORING_ENABLED}
+      - POSTGRES_DB=${POSTGRES_DB}
+      - POSTGRES_HOST=${POSTGRES_HOST}
+      - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
+      - POSTGRES_PORT=${POSTGRES_PORT}
+      - POSTGRES_USER=${POSTGRES_USER}
+      - R_CLONE_OPTION_BUFFER_SIZE=${R_CLONE_OPTION_BUFFER_SIZE}
+      - R_CLONE_OPTION_RETRIES=${R_CLONE_OPTION_RETRIES}
+      - R_CLONE_OPTION_TRANSFERS=${R_CLONE_OPTION_TRANSFERS}
+      - R_CLONE_PROVIDER=${R_CLONE_PROVIDER}
+      - RABBIT_HOST=${RABBIT_HOST}
+      - RABBIT_PASSWORD=${RABBIT_PASSWORD}
+      - RABBIT_PORT=${RABBIT_PORT}
+      - RABBIT_SECURE=${RABBIT_SECURE}
+      - RABBIT_USER=${RABBIT_USER}
+      - REDIS_HOST=${REDIS_HOST}
+      - REDIS_PORT=${REDIS_PORT}
+      - REGISTRY_AUTH=${REGISTRY_AUTH}
+      - REGISTRY_PATH=${REGISTRY_PATH}
+      - REGISTRY_PW=${REGISTRY_PW}
+      - REGISTRY_SSL=${REGISTRY_SSL}
+      - REGISTRY_URL=${REGISTRY_URL}
+      - REGISTRY_USER=${REGISTRY_USER}
+      - RESOURCE_USAGE_TRACKER_HOST=${RESOURCE_USAGE_TRACKER_HOST}
       - S3_ACCESS_KEY=${S3_ACCESS_KEY}
+      - S3_ACCESS_TOKEN=${S3_ACCESS_TOKEN}
       - S3_BUCKET_NAME=${S3_BUCKET_NAME}
       - S3_ENDPOINT=${S3_ENDPOINT}
       - S3_SECRET_KEY=${S3_SECRET_KEY}
-      - R_CLONE_PROVIDER=${R_CLONE_PROVIDER}
-      - R_CLONE_OPTION_TRANSFERS=${R_CLONE_OPTION_TRANSFERS}
-      - R_CLONE_OPTION_RETRIES=${R_CLONE_OPTION_RETRIES}
-      - R_CLONE_OPTION_BUFFER_SIZE=${R_CLONE_OPTION_BUFFER_SIZE}
-      - MONITORING_ENABLED=${MONITORING_ENABLED:-True}
-      - SIMCORE_SERVICES_NETWORK_NAME=interactive_services_subnet
-      - TRACING_THRIFT_COMPACT_ENDPOINT=${TRACING_THRIFT_COMPACT_ENDPOINT}
-      - DYNAMIC_SIDECAR_PROMETHEUS_SERVICE_LABELS=${DYNAMIC_SIDECAR_PROMETHEUS_SERVICE_LABELS}
-      - DYNAMIC_SIDECAR_PROMETHEUS_MONITORING_NETWORKS=${DYNAMIC_SIDECAR_PROMETHEUS_MONITORING_NETWORKS}
-    env_file:
-      - ../.env
+      - S3_SECURE=${S3_SECURE}
+      - SIMCORE_SERVICES_NETWORK_NAME=${SIMCORE_SERVICES_NETWORK_NAME}
+      - STORAGE_HOST=${STORAGE_HOST}
+      - STORAGE_PORT=${STORAGE_PORT}
+      - SWARM_STACK_NAME=${SWARM_STACK_NAME}
+      - TRAEFIK_SIMCORE_ZONE=${TRAEFIK_SIMCORE_ZONE}
     volumes:
       - "/var/run/docker.sock:/var/run/docker.sock"
     deploy: