Upgrade conda-store v0.3.10 and simplify specification of image (#1130)

* remove conda store image from input_vars * remove terraform variables * uprade image to v0.3.10 * reinstate terraform variables with an image default
nebari-dev · Mar 1, 2022 · 06e9402 · 06e9402
1 parent e6302f5
commit 06e9402
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 9 deletions.
diff --git a/qhub/stages/input_vars.py b/qhub/stages/input_vars.py
@@ -214,9 +214,6 @@ def stage_07_kubernetes_services(stage_outputs, config):
         # conda-store
         "conda-store-environments": config["environments"],
         "conda-store-storage": config["storage"]["conda_store"],
-        "conda-store-image": _split_docker_image_name(
-            "quansight/conda-store-server:v0.3.9"
-        ),
         # jupyterhub
         "cdsdashboards": config["cdsdashboards"],
         "jupyterhub-theme": config["theme"]["jupyterhub"],

diff --git a/qhub/template/stages/07-kubernetes-services/conda-store.tf b/qhub/template/stages/07-kubernetes-services/conda-store.tf
@@ -15,9 +15,12 @@ variable "conda-store-image" {
     name = string
     tag  = string
   })
+  default = {
+    name = "quansight/conda-store-server"
+    tag  = "v0.3.10"
+  }
 }
 
-
 # ====================== RESOURCES =======================
 module "kubernetes-conda-store-server" {
   source = "./modules/kubernetes/services/conda-store"

diff --git a/...mplate/stages/07-kubernetes-services/modules/kubernetes/services/conda-store/variables.tf b/...mplate/stages/07-kubernetes-services/modules/kubernetes/services/conda-store/variables.tf
@@ -34,10 +34,6 @@ variable "conda-store-image" {
     name = string
     tag  = string
   })
-  default = {
-    name = "quansight/conda-store-server"
-    tag  = "v0.3.10"
-  }
 }
 
 variable "external-url" {

diff --git a/...emplate/stages/07-kubernetes-services/modules/kubernetes/services/monitoring/variables.tf b/...emplate/stages/07-kubernetes-services/modules/kubernetes/services/monitoring/variables.tf
@@ -28,7 +28,6 @@ variable "dashboards" {
   ]
 }
 
-
 variable "node-group" {
   description = "Node key value pair for bound resources"
   type = object({