feat(vaultwarden): support CNPG as database

Signed-off-by: Sebastian Gaiser <sebastiangaiser@users.noreply.github.com>

Author: sebastiangaiser

.github/workflows/lint-test.yaml

@@ -58,6 +58,11 @@ jobs:
           helm install postgres-operator postgres-operator-charts/postgres-operator
         if: steps.list-changed.outputs.changed == 'true'
 
+      - name: Install CNPG
+        run: |
+          helm install --atomic --namespace cnpg-system --create-namespace --repo https://cloudnative-pg.github.io/charts cnpg cloudnative-pg
+        if: steps.list-changed.outputs.changed == 'true'
+
       - name: Install prometheus-operator-crds
         run: |
           helm install --repo https://prometheus-community.github.io/helm-charts prometheus-operator-crds prometheus-operator-crds

charts/vaultwarden/Chart.yaml

@@ -8,6 +8,6 @@ icon: https://raw.githubusercontent.com/bitwarden/brand/master/icons/icon.svg
 sources:
   - https://github.com/dani-garcia/vaultwarden
   - https://github.com/sebastiangaiser/helm-charts/
-version: 0.11.11
+version: 0.12.0
 maintainers:
   - name: sebastiangaiser

charts/vaultwarden/README.md

@@ -1,6 +1,6 @@
 # vaultwarden
 
-![Version: 0.11.11](https://img.shields.io/badge/Version-0.11.11-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.33.2](https://img.shields.io/badge/AppVersion-1.33.2-informational?style=flat-square)
+![Version: 0.12.0](https://img.shields.io/badge/Version-0.12.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.33.2](https://img.shields.io/badge/AppVersion-1.33.2-informational?style=flat-square)
 
 A Helm chart for deploying Vaultwarden to Kubernetes
 
@@ -22,6 +22,7 @@ A Helm chart for deploying Vaultwarden to Kubernetes
 | additionalVolumeMounts | list | `[]` | Additional volume mounts |
 | additionalVolumes | object | `{}` | Additional volumes |
 | affinity | object | `{}` | Affinities |
+| cnpg.enabled | bool | `false` |  |
 | deploymentStrategy.type | string | `"Recreate"` |  |
 | fullnameOverride | string | `""` |  |
 | horizontalAutoscaling | object | `{"enabled":false,"maxReplicas":3,"minReplicas":1,"targetCPUUtilizationPercentage":75,"targetMemoryUtilizationPercentage":75}` | HPA configuration |

charts/vaultwarden/ci/with-cnpg-values.yaml

@@ -0,0 +1,2 @@
+cnpg:
+  enabled: true

charts/vaultwarden/templates/deployment.yaml

@@ -41,6 +41,34 @@ spec:
         {{- end }}
       {{- if ( or .Values.initContainers .Values.zalandoPostgresql.enabled ) }}
       initContainers:
+        {{- if .Values.cnpg.enabled }}
+        - name: check-postgresql-ready
+          image: "postgres:{{ .Values.cnpg.version }}"
+          command: ['bash', '-c',
+            'until pg_isready; do echo waiting for database be ready; sleep 2; done;']
+          args: []
+          env:
+            - name: PGHOST
+              valueFrom:
+                secretKeyRef:
+                  name: "{{ include "vaultwarden.fullname" . }}-app"
+                  key: "hostname"
+            - name: PGUSER
+              valueFrom:
+                secretKeyRef:
+                  name: "{{ include "vaultwarden.fullname" . }}-app"
+                  key: "username"
+            - name: PGPASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: "{{ include "vaultwarden.fullname" . }}-app"
+                  key: "password"
+            - name: PGDATABASE
+              valueFrom:
+                secretKeyRef:
+                  name: "{{ include "vaultwarden.fullname" . }}-app"
+                  key: "database"
+        {{- end }}
         {{- if .Values.zalandoPostgresql.enabled }}
         - name: check-postgresql-ready
           image: "postgres:{{ .Values.zalandoPostgresql.version }}"
@@ -89,6 +117,13 @@ spec:
                   name: {{ template "vaultwarden.fullname" . }}-admin-token
                   key: admin-token
           {{- end }}
+          {{- if .Values.cnpg.enabled }}
+            - name: DATABASE_URL
+              valueFrom:
+                secretKeyRef:
+                  name: "{{ include "vaultwarden.fullname" . }}-app"
+                  key: "database-url"
+          {{- end }}
           {{- if .Values.zalandoPostgresql.enabled }}
             - name: POSTGRES_HOST
               value: {{ .Values.zalandoPostgresql.teamId | default "acid" }}-{{ include "vaultwarden.fullname" . }}

charts/vaultwarden/values.yaml

@@ -111,6 +111,14 @@ tolerations: []
 # -- Affinities
 affinity: {}
 
+## -- CNPG database configuration
+cnpg:
+  enabled: false
+  backup: {}
+  version: "16"
+  instances: "1"
+  size: 1Gi
+
 ## -- Zalando PostgreSQL database configuration
 zalandoPostgresql:
   enabled: false