Merge pull request #36 from nfdi4health/feat/configure-resource-volume

feat(dataverse): Configure solr and postgres via Values (remove hardcoded values)
nfdi4health · Jan 9, 2025 · 68a3525 · 68a3525
2 parents e012001 + 89af9b9
commit 68a3525
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 5 deletions.
diff --git a/k8s/dataverse/Chart.yaml b/k8s/dataverse/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.9.0
+version: 0.9.1
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

diff --git a/k8s/dataverse/templates/postgres.yaml b/k8s/dataverse/templates/postgres.yaml
@@ -10,14 +10,16 @@ metadata:
     app.kubernetes.io/component: postgres
     app.kubernetes.io/part-of: dataverse
 spec:
-  enableLogicalBackup: true
+  enableLogicalBackup: {{ .Values.postgres.logical_backup }}
   teamId:  {{ .Release.Name }}
   volume:
-    size: 32Gi
-  numberOfInstances: 2
+    size:  {{ .Values.postgres.volume_size }}
+  numberOfInstances: {{ int .Values.postgres.number_instances }}
+  {{ if gt (int .Values.postgres.number_instances) 1 }}
   enableConnectionPooler: true
   connectionPooler:
    mode: session
+  {{ end }}
   users:
     dataverse:  # database owner
     - superuser

diff --git a/k8s/dataverse/templates/solr.yaml b/k8s/dataverse/templates/solr.yaml
@@ -29,7 +29,7 @@ spec:
     - ReadWriteOnce
   resources:
     requests:
-      storage: 2Gi
+      storage: {{ .Values.solr.volume_size }}
 ---
 apiVersion: v1
 kind: PersistentVolumeClaim
@@ -106,6 +106,10 @@ spec:
             value: "0.0.0.0"
           - name: SOLR_OPTS
             value: "-Dsolr.jetty.request.header.size=65535"
+{{ if .Values.solr.resources }}
+        resources:
+{{ toYaml .Values.solr.resources | indent 10 }}
+{{ end }}
         ports:
           - containerPort: 8983
         volumeMounts:

diff --git a/k8s/dataverse/values.yaml b/k8s/dataverse/values.yaml
@@ -23,6 +23,17 @@ dataverse:
       shoulder:
       base_url:
       separator:
+postgres:
+  volume_size: "32Gi"
+  number_instances: 2
+  logical_backup: true
+solr:
+  volume_size: "2Gi"
+  resources:
+    limits:
+      memory: "4Gi"
+    requests:
+      memory: "1Gi"
 images:
   backend: ghcr.io/nfdi4health/csh-ui/dataverse:6.5
   configbaker: ghcr.io/nfdi4health/csh-ui/dataverse-baker:6.5