set dbconnectstring value for jhub #21

vre-hub · Feb 13, 2023 · ac6c0c4 · ac6c0c4
1 parent 95f1605
commit ac6c0c4
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/iac/tf/cluster/jhub/config.yaml b/iac/tf/cluster/jhub/config.yaml
@@ -9,10 +9,6 @@
 # Available chart versions: https://jupyterhub.github.io/helm-chart/
 #
 
-hub:
-  db:
-    type: sqlite-memory # change to postgres ref.: https://z2jh.jupyter.org/en/stable/resources/reference.html?highlight=database#hub-db-type
-
 proxy:
   service:
     type: LoadBalancer
@@ -25,3 +21,4 @@ proxy:
 singleuser:
   storage:
     type: none
+
diff --git a/iac/tf/cluster/main-helm.tf b/iac/tf/cluster/main-helm.tf
@@ -32,7 +32,7 @@ resource "helm_release" "rucio-daemons-chart" {
 
   set {
     name  = "config.database.default"
-    value = data.kubernetes_secret_v1.rucio_db_secret.data.dbconnectstring
+    value = data.kubernetes_secret_v1.jhub_db_secret.data.dbconnectstring
   }
 }
 
@@ -82,6 +82,11 @@ resource "helm_release" "jupyterhub-chart" {
   values = [
     "${file("jhub/config.yaml")}"
   ]
+
+  set {
+    name  = "hub.db.url"
+    value = data.kubernetes_secret_v1.rucio_db_secret.data.dbconnectstring
+  }
 }
 
 # Reana

diff --git a/iac/tf/cluster/main-k8s.tf b/iac/tf/cluster/main-k8s.tf
@@ -7,6 +7,13 @@ data "kubernetes_secret_v1" "rucio_db_secret" {
   }
 }
 
+data "kubernetes_secret_v1" "jhub_db_secret" {
+  metadata {
+    name      = "jhub-cvre-dbconnectstring"
+    namespace = "jhub"
+  }
+}
+
 # Kubernetes Resources
 
 # Namespaces