Simplify default images (#1114)

* fix bug in state_01_terraform_state function call * Make function call fit deployment paradigm * remove default images in qhub-config.yaml * correct schema for image to be str instead of bool
nebari-dev · Feb 24, 2022 · 4360056 · 4360056
1 parent d6d895d
commit 4360056
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/qhub/initialize.py b/qhub/initialize.py
@@ -170,7 +170,6 @@
                 "cpu_guarantee": 0.75,
                 "mem_limit": "4G",
                 "mem_guarantee": "2.5G",
-                "image": f"quansight/qhub-jupyterlab:{qhub_image_tag}",
             },
         },
         {
@@ -181,7 +180,6 @@
                 "cpu_guarantee": 1.5,
                 "mem_limit": "8G",
                 "mem_guarantee": "5G",
-                "image": f"quansight/qhub-jupyterlab:{qhub_image_tag}",
             },
         },
     ],
@@ -192,15 +190,13 @@
             "worker_memory_limit": "4G",
             "worker_memory": "2.5G",
             "worker_threads": 1,
-            "image": f"quansight/qhub-dask-worker:{qhub_image_tag}",
         },
         "Medium Worker": {
             "worker_cores_limit": 2,
             "worker_cores": 1.5,
             "worker_memory_limit": "8G",
             "worker_memory": "5G",
             "worker_threads": 2,
-            "image": f"quansight/qhub-dask-worker:{qhub_image_tag}",
         },
     },
 }

diff --git a/qhub/schema.py b/qhub/schema.py
@@ -284,7 +284,7 @@ class KubeSpawner(Base):
     cpu_guarantee: int
     mem_limit: str
     mem_guarantee: str
-    image: str
+    image: typing.Optional[str]
 
     class Config:
         extra = "allow"
@@ -304,7 +304,7 @@ class DaskWorkerProfile(Base):
     worker_cores: int
     worker_memory_limit: str
     worker_memory: str
-    image: str
+    image: typing.Optional[str]
 
     class Config:
         extra = "allow"