refactor: adjust default image envs

Signed-off-by: thxCode <[email protected]>

Author: thxCode

gpustack_runtime/deployer/__types__.py

@@ -1020,11 +1020,11 @@ def validate_and_default(self):
                 c.execution.command_script = None
             # Add default registry if needed.
             if (
-                envs.GPUSTACK_RUNTIME_DEPLOY_DEFAULT_REGISTRY
-                and envs.GPUSTACK_RUNTIME_DEPLOY_DEFAULT_REGISTRY
+                envs.GPUSTACK_RUNTIME_DEPLOY_DEFAULT_IMAGE_REGISTRY
+                and envs.GPUSTACK_RUNTIME_DEPLOY_DEFAULT_IMAGE_REGISTRY
                 not in ["docker.io", "index.docker.io"]
             ):
-                image_registry = envs.GPUSTACK_RUNTIME_DEPLOY_DEFAULT_NAMESPACE
+                image_registry = envs.GPUSTACK_RUNTIME_DEPLOY_DEFAULT_IMAGE_NAMESPACE
                 image_split = c.image.split("/")
                 if len(image_split) == 1:
                     c.image = f"{image_registry}/library/{c.image}"

gpustack_runtime/deployer/docker.py

@@ -139,7 +139,7 @@ def validate_and_default(self):
         super().validate_and_default()
 
         # Adjust default image namespace if needed.
-        if namespace := envs.GPUSTACK_RUNTIME_DEPLOY_DEFAULT_NAMESPACE:
+        if namespace := envs.GPUSTACK_RUNTIME_DEPLOY_DEFAULT_IMAGE_NAMESPACE:
             self.pause_image = replace_image_with(
                 image=self.pause_image,
                 namespace=namespace,
@@ -463,12 +463,12 @@ def _pull_image(self, image: str) -> docker.models.images.Image:
             tag = tag or "latest"
             auth_config = None
             if (
-                envs.GPUSTACK_RUNTIME_DEPLOY_DEFAULT_REGISTRY_USERNAME
-                and envs.GPUSTACK_RUNTIME_DEPLOY_DEFAULT_REGISTRY_PASSWORD
+                envs.GPUSTACK_RUNTIME_DEPLOY_DEFAULT_IMAGE_REGISTRY_USERNAME
+                and envs.GPUSTACK_RUNTIME_DEPLOY_DEFAULT_IMAGE_REGISTRY_PASSWORD
             ):
                 auth_config = {
-                    "username": envs.GPUSTACK_RUNTIME_DEPLOY_DEFAULT_REGISTRY_USERNAME,
-                    "password": envs.GPUSTACK_RUNTIME_DEPLOY_DEFAULT_REGISTRY_PASSWORD,
+                    "username": envs.GPUSTACK_RUNTIME_DEPLOY_DEFAULT_IMAGE_REGISTRY_USERNAME,
+                    "password": envs.GPUSTACK_RUNTIME_DEPLOY_DEFAULT_IMAGE_REGISTRY_PASSWORD,
                 }
 
             logs = self._client.api.pull(

gpustack_runtime/deployer/kuberentes.py

@@ -1206,16 +1206,16 @@ def _prepare_create(self):
 
         # Create image pull secrets if default registry credentials are set.
         if not self._image_pull_secret and (
-            envs.GPUSTACK_RUNTIME_DEPLOY_DEFAULT_REGISTRY_USERNAME
-            and envs.GPUSTACK_RUNTIME_DEPLOY_DEFAULT_REGISTRY_PASSWORD
+            envs.GPUSTACK_RUNTIME_DEPLOY_DEFAULT_IMAGE_REGISTRY_USERNAME
+            and envs.GPUSTACK_RUNTIME_DEPLOY_DEFAULT_IMAGE_REGISTRY_PASSWORD
         ):
             registry = (
-                envs.GPUSTACK_RUNTIME_DEPLOY_DEFAULT_REGISTRY or "index.docker.io"
+                envs.GPUSTACK_RUNTIME_DEPLOY_DEFAULT_IMAGE_REGISTRY or "index.docker.io"
             )
             self._image_pull_secret = self._apply_image_pull_secret(
                 registry=f"https://{registry}/v1/",
-                username=envs.GPUSTACK_RUNTIME_DEPLOY_DEFAULT_REGISTRY_USERNAME,
-                password=envs.GPUSTACK_RUNTIME_DEPLOY_DEFAULT_REGISTRY_PASSWORD,
+                username=envs.GPUSTACK_RUNTIME_DEPLOY_DEFAULT_IMAGE_REGISTRY_USERNAME,
+                password=envs.GPUSTACK_RUNTIME_DEPLOY_DEFAULT_IMAGE_REGISTRY_PASSWORD,
             )
 
         # Prepare mirrored deployment if enabled.

gpustack_runtime/envs.py

@@ -62,25 +62,6 @@
     """
     Deployer to use (options: Auto, Docker, Kubernetes).
     """
-    GPUSTACK_RUNTIME_DEPLOY_DEFAULT_REGISTRY: str | None = None
-    """
-    Default container registry for deployer to pull images from.
-    If not set, it should be "docker.io".
-    If the image name already contains a registry, this setting will be ignored.
-    """
-    GPUSTACK_RUNTIME_DEPLOY_DEFAULT_NAMESPACE: str | None = None
-    """
-    Namespace for default runner images.
-    If not set, it should be "gpustack".
-    """
-    GPUSTACK_RUNTIME_DEPLOY_DEFAULT_REGISTRY_USERNAME: str | None = None
-    """
-    Username for the default container registry.
-    """
-    GPUSTACK_RUNTIME_DEPLOY_DEFAULT_REGISTRY_PASSWORD: str | None = None
-    """
-    Password for the default container registry.
-    """
     GPUSTACK_RUNTIME_DEPLOY_API_CALL_ERROR_DETAIL: bool = True
     """
     Enable detailing the API call error during deployment.
@@ -138,6 +119,25 @@
     """
     Correct the gpustack-runner image by rendering it with the host's detection.
     """
+    GPUSTACK_RUNTIME_DEPLOY_DEFAULT_IMAGE_REGISTRY: str | None = None
+    """
+    Default container registry for deployer to pull images from.
+    If not set, it should be "docker.io".
+    If the image name already contains a registry, this setting will be ignored.
+    """
+    GPUSTACK_RUNTIME_DEPLOY_DEFAULT_IMAGE_NAMESPACE: str | None = None
+    """
+    Namespace for default runner images.
+    If not set, it should be "gpustack".
+    """
+    GPUSTACK_RUNTIME_DEPLOY_DEFAULT_IMAGE_REGISTRY_USERNAME: str | None = None
+    """
+    Username for the default container registry.
+    """
+    GPUSTACK_RUNTIME_DEPLOY_DEFAULT_IMAGE_REGISTRY_PASSWORD: str | None = None
+    """
+    Password for the default container registry.
+    """
     GPUSTACK_RUNTIME_DEPLOY_IMAGE_PULL_POLICY: str | None = None
     """
     Image pull policy for the deployer (e.g., Always, IfNotPresent, Never).
@@ -299,23 +299,6 @@
         "GPUSTACK_RUNTIME_DEPLOY",
         "Auto",
     ),
-    "GPUSTACK_RUNTIME_DEPLOY_DEFAULT_REGISTRY": lambda: trim_str(
-        getenvs(
-            keys=[
-                "GPUSTACK_RUNTIME_DEPLOY_DEFAULT_REGISTRY",
-                "GPUSTACK_SYSTEM_DEFAULT_CONTAINER_REGISTRY",  # Compatible with gpustack/gpustack.
-            ],
-        ),
-    ),
-    "GPUSTACK_RUNTIME_DEPLOY_DEFAULT_NAMESPACE": lambda: trim_str(
-        getenv("GPUSTACK_RUNTIME_DEPLOY_DEFAULT_NAMESPACE"),
-    ),
-    "GPUSTACK_RUNTIME_DEPLOY_DEFAULT_REGISTRY_USERNAME": lambda: trim_str(
-        getenv("GPUSTACK_RUNTIME_DEPLOY_DEFAULT_REGISTRY_USERNAME"),
-    ),
-    "GPUSTACK_RUNTIME_DEPLOY_DEFAULT_REGISTRY_PASSWORD": lambda: getenv(
-        "GPUSTACK_RUNTIME_DEPLOY_DEFAULT_REGISTRY_PASSWORD",
-    ),
     "GPUSTACK_RUNTIME_DEPLOY_API_CALL_ERROR_DETAIL": lambda: to_bool(
         getenv("GPUSTACK_RUNTIME_DEPLOY_API_CALL_ERROR_DETAIL", "1"),
     ),
@@ -349,6 +332,42 @@
     "GPUSTACK_RUNTIME_DEPLOY_CORRECT_RUNNER_IMAGE": lambda: to_bool(
         getenv("GPUSTACK_RUNTIME_DEPLOY_CORRECT_RUNNER_IMAGE", "1"),
     ),
+    "GPUSTACK_RUNTIME_DEPLOY_DEFAULT_IMAGE_REGISTRY": lambda: trim_str(
+        getenvs(
+            keys=[
+                "GPUSTACK_RUNTIME_DEPLOY_DEFAULT_IMAGE_REGISTRY",
+                # TODO(thxCode): Backward compatibility, remove in v0.1.45 later.
+                "GPUSTACK_RUNTIME_DEPLOY_DEFAULT_REGISTRY",
+                # Compatible with gpustack/gpustack.
+                "GPUSTACK_SYSTEM_DEFAULT_CONTAINER_REGISTRY",
+            ],
+        ),
+    ),
+    "GPUSTACK_RUNTIME_DEPLOY_DEFAULT_IMAGE_NAMESPACE": lambda: trim_str(
+        getenvs(
+            keys=[
+                "GPUSTACK_RUNTIME_DEPLOY_DEFAULT_IMAGE_NAMESPACE",
+                # TODO(thxCode): Backward compatibility, remove in v0.1.45 later.
+                "GPUSTACK_RUNTIME_DEPLOY_DEFAULT_NAMESPACE",
+            ],
+        ),
+    ),
+    "GPUSTACK_RUNTIME_DEPLOY_DEFAULT_IMAGE_REGISTRY_USERNAME": lambda: trim_str(
+        getenvs(
+            keys=[
+                "GPUSTACK_RUNTIME_DEPLOY_DEFAULT_IMAGE_REGISTRY_USERNAME",
+                # TODO(thxCode): Backward compatibility, remove in v0.1.45 later.
+                "GPUSTACK_RUNTIME_DEPLOY_DEFAULT_REGISTRY_USERNAME",
+            ],
+        ),
+    ),
+    "GPUSTACK_RUNTIME_DEPLOY_DEFAULT_IMAGE_REGISTRY_PASSWORD": lambda: getenvs(
+        keys=[
+            "GPUSTACK_RUNTIME_DEPLOY_DEFAULT_IMAGE_REGISTRY_PASSWORD",
+            # TODO(thxCode): Backward compatibility, remove in v0.1.45 later.
+            "GPUSTACK_RUNTIME_DEPLOY_DEFAULT_REGISTRY_PASSWORD",
+        ],
+    ),
     "GPUSTACK_RUNTIME_DEPLOY_IMAGE_PULL_POLICY": lambda: choice(
         getenv(
             "GPUSTACK_RUNTIME_DEPLOY_IMAGE_PULL_POLICY",