remove postgresql database and add persistence (#166)

Author: ihiverlet

charts/cloudbeaver-chart/Chart.yaml

@@ -22,7 +22,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: 2.0.10
+version: 2.0.11
 
 # 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
@@ -31,9 +31,5 @@ appVersion: latest
 
 dependencies:
   - name: library-chart
-    version: 1.7.5
+    version: 1.7.11
     repository: https://inseefrlab.github.io/helm-charts-interactive-services
-  - name: postgresql
-    version: 16.7.13
-    repository:  https://charts.bitnami.com/bitnami
-    enabled: true

charts/cloudbeaver-chart/templates/NOTES.txt

@@ -6,10 +6,3 @@
 {{- end }}
 - Your username is **{{ .Values.security.username }}**
 - Your password is **{{ .Values.security.password }}**
-
-*NOTES about deletion :*
-
-- **You can safely delete this chart and recreate one later**
-- Data volumes in the associated postgresql will not be deleted
-- If you start a new {{ .Chart.Name }}, it will reuse this volume silently.
-- If you want to delete this volume definitely : `kubectl delete pvc data-{{ .Values.postgresql.fullnameOverride }}-0`

charts/cloudbeaver-chart/templates/configmap-cb.yaml

@@ -29,10 +29,10 @@ data:
         develMode: false,
 
         database: {
-            driver: "postgres-jdbc" ,
-            url : "jdbc:postgresql://{{ .Values.postgresql.fullnameOverride }}:5432/{{ .Values.postgresql.auth.database }}" ,
-            user : {{ .Values.postgresql.auth.username }} ,
-            password : {{ .Values.postgresql.auth.password }} ,
+            driver: "h2_embedded_v2",
+            url: "jdbc:h2:${workspace}/.data/cb.h2v2.dat}",
+            user : {{ .Values.security.username }} ,
+            password : {{ .Values.security.password }} ,
             initialDataConfiguration: "conf/initial-data.conf",
             pool: {
                 minIdleConnections: 4,

charts/cloudbeaver-chart/templates/deployment.yaml

@@ -36,6 +36,10 @@ spec:
           image: "{{ .Values.service.image.version }}"
           imagePullPolicy: {{ .Values.service.image.pullPolicy }}
           volumeMounts:
+          {{- if .Values.persistence.enabled }}
+          - name: cloudbeaver-data
+            mountPath: /opt/cloudbeaver/workspace
+          {{- end }}
           - name: cb-config
             mountPath: /opt/cloudbeaver/conf/cloudbeaver.conf
             subPath: cloudbeaver.conf
@@ -47,7 +51,6 @@ spec:
             mountPath: /opt/cloudbeaver/conf/initial-data-sources.conf
             subPath: initial-data-sources.conf
           {{- end }}
-
           env:
           - name: CB_ADMIN_NAME
             value: "{{ .Values.security.username }}"
@@ -57,7 +60,6 @@ spec:
             value: "{{ .Values.cloudbeaver.serverName }}"
           - name: CB_SERVER_URL
             value: "https://{{ .Values.ingress.hostname }}"
-
           ports:
             - name: http
               containerPort: {{ .Values.networking.beaver.port}}
@@ -72,8 +74,12 @@ spec:
               port: http
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
-
       volumes:
+      {{- if .Values.persistence.enabled }}
+        - name: cloudbeaver-data
+          persistentVolumeClaim:
+            claimName: {{ include "library-chart.fullname" . }}
+      {{- end }}
         - name: cb-config
           configMap:
             name: {{ include "library-chart.fullname" . }}-cb-config
@@ -85,23 +91,6 @@ spec:
           secret:
             secretName: {{ include "library-chart.fullname" . }}
         {{- end }}
-
-      initContainers:
-        - name: wait-for-postgresql
-          image: "alpine"
-          imagePullPolicy: IfNotPresent
-          command:
-            - sh
-            - -c
-            - |
-              until printf "." && nc -z -w 2 {{ .Values.postgresql.fullnameOverride }} 5432; do
-                  sleep 2;
-              done;
-              echo 'PostgreSQL OK ✓'
-          resources:
-            requests:
-              cpu: "0.05"
-              memory: "128Mi"
       {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}

charts/cloudbeaver-chart/templates/pvc.yaml

@@ -0,0 +1,12 @@
+{{- if .Values.persistence.enabled }}
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: {{ include "library-chart.fullname" . }}
+spec:
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: {{ .Values.persistence.size }}
+{{- end }}

charts/cloudbeaver-chart/values.schema.json

@@ -38,6 +38,28 @@
         }
       }
     },
+    "persistence": {
+      "title": "Persistence",
+      "type": "object",
+      "properties": {
+        "enabled": {
+          "title": "Create a persistent volume",
+          "type": "boolean",
+          "default": true
+        },
+        "size": {
+          "title": "Persistent volume size",
+          "type": "string",
+          "default": "10Gi",
+          "form": true,
+          "render": "slider",
+          "sliderMin": 1,
+          "sliderMax": 100,
+          "sliderStep": 1,
+          "sliderUnit": "Gi"
+        }
+      }
+    },
     "resources": {
       "description": "Your service will have at least the requested resources and never more than its limits. No limit for a resource and you can consume everything left on the host machine.",
       "type": "object",
@@ -172,78 +194,6 @@
         }
       }
     },
-    "postgresql": {
-      "description": "postgres specific configuration",
-      "type": "object",
-      "title": "Database",
-      "properties": {
-        "image": {
-          "description": "image specific configuration",
-          "type": "object",
-          "properties": {
-            "tag": {
-              "description": "postgresql major version",
-              "type": "string",
-              "enum": [
-                "12",
-                "13",
-                "14",
-                "15",
-                "16",
-                "17"
-              ],
-              "default": "17"
-            }
-          }
-        },
-        "auth": {
-          "description": "postgres specific configuration",
-          "type": "object",
-          "title": "Authentification",
-          "properties": {
-            "username": {
-              "type": "string",
-              "title": "User",
-              "default": "user",
-              "x-form": {
-                "value": "{{project.id}}"
-              },
-              "x-onyxia": {
-                "overwriteDefaultWith": "{{project.id}}"
-              }
-            },
-            "password": {
-              "type": "string",
-              "title": "User Password",
-              "default": "changeme",
-              "x-form": {
-                "value": "{{project.password}}"
-              },
-              "x-onyxia": {
-                "overwriteDefaultWith": "{{project.password}}"
-              }
-            },
-            "postgresPassword": {
-              "type": "string",
-              "title": "Admin Password",
-              "default": "changeme",
-              "x-form": {
-                "value": "{{project.password}}"
-              },
-              "x-onyxia": {
-                "overwriteDefaultWith": "{{project.password}}"
-              }
-            },
-            "database": {
-              "description": "Name for the default database that is created when the image is first started.",
-              "type": "string",
-              "title": "Database",
-              "default": "cloudbeaver"
-            }
-          }
-        }
-      }
-    },
     "discovery": {
       "description": "configure your service to autodetect some ressources.",
       "type": "object",

charts/cloudbeaver-chart/values.yaml

@@ -10,27 +10,6 @@ discovery:
   mariadb: true
   trino: true
 
-postgresql:
-  image:
-    tag: "17"
-  auth:
-    username: "admin"
-    password: "changeme"
-    postgresPassword: "changeme"
-    database: "cloudbeaver"
-  fullnameOverride: "cloudbeaver-db"
-  primary:
-    resources:
-      limits:
-        cpu: "1000m"
-        memory: "2000Mi"
-      requests:
-        memory: 256Mi
-        cpu: 250m
-    persistence:
-      enabled: true
-      size: 8Gi
-
 cloudbeaver:
   serverName: "Cloudbeaver Server"
 
@@ -117,6 +96,10 @@ resources: {}
   #   cpu: 100m
   #   memory: 128Mi
 
+persistence:
+  enabled: true
+  size: 10Gi
+
 autoscaling:
   enabled: false
   minReplicas: 1