From 8cbf9fe566ca9cebadad07218a9f6662c7eef5d4 Mon Sep 17 00:00:00 2001
From: Domenic Gosein <87760323+goseind@users.noreply.github.com>
Date: Mon, 13 Feb 2023 16:48:42 +0100
Subject: [PATCH] adjust jhub config #21

---
 iac/tf/cluster/jhub/config.yaml | 12 ++++++++++--
 iac/tf/cluster/main-helm.tf     |  2 +-
 iac/tf/cluster/variables.tf     |  2 +-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/iac/tf/cluster/jhub/config.yaml b/iac/tf/cluster/jhub/config.yaml
index 34e23c8a..1a3bb0d0 100644
--- a/iac/tf/cluster/jhub/config.yaml
+++ b/iac/tf/cluster/jhub/config.yaml
@@ -9,10 +9,15 @@
 # Available chart versions: https://jupyterhub.github.io/helm-chart/
 #
 
+hub:
+  db:
+    type: postgres
+    upgrade: true
+
 proxy:
   service:
     type: LoadBalancer
-    loadBalancerIP: 137.138.226.35 # may change if LB needs to be created manually due to bug: openstack loadbalancer create --name <lb-name> --vip-network-id <network-id>
+    loadBalancerIP: 137.138.226.36 # may change if LB needs to be created manually due to bug: openstack loadbalancer create --name <lb-name> --vip-network-id <network-id>
     annotations:
       loadbalancer.openstack.org/network-id: "798d00f3-2af9-48a0-a7c3-a26d909a2d64"
       service.beta.kubernetes.io/openstack-internal-load-balancer: "true"
@@ -21,4 +26,7 @@ proxy:
 singleuser:
   storage:
     type: none
-    
\ No newline at end of file
+
+# ingress:
+#   enabled: true # can be an alternative for LBaaS in combination with proxy.service.type: ClusterIP
+#   ingressClassName: nginx
diff --git a/iac/tf/cluster/main-helm.tf b/iac/tf/cluster/main-helm.tf
index d8c49fd2..a6db9a09 100644
--- a/iac/tf/cluster/main-helm.tf
+++ b/iac/tf/cluster/main-helm.tf
@@ -85,7 +85,7 @@ resource "helm_release" "jupyterhub-chart" {
 
   set {
     name  = "hub.db.url"
-    value = data.kubernetes_secret_v1.rucio_db_secret.data.dbconnectstring
+    value = data.kubernetes_secret_v1.jhub_db_secret.data.dbconnectstring
   }
 }
 
diff --git a/iac/tf/cluster/variables.tf b/iac/tf/cluster/variables.tf
index 97a2ec0f..bcacfcc0 100644
--- a/iac/tf/cluster/variables.tf
+++ b/iac/tf/cluster/variables.tf
@@ -35,7 +35,7 @@ variable "logging-producer" {
 variable "reana-share-name" {
   description = "The reana share name"
   type        = string
-  default     = "reana_sh1"
+  default     = "cvre-reana"
 }
 
 variable "cephfs-type" {