Sfoglia il codice sorgente

vaultwarden - replace boilerplate with template

Stavros kois 1 anno fa
parent
commit
cc5d93e0c2

+ 1 - 1
library/ix-dev/community/vaultwarden/Chart.yaml

@@ -4,7 +4,7 @@ description: Alternative implementation of the Bitwarden server API written in R
 annotations:
   title: Vaultwarden
 type: application
-version: 1.0.27
+version: 1.0.28
 apiVersion: v2
 appVersion: 1.30.0
 kubeVersion: '>=1.16.0-0'

+ 6 - 38
library/ix-dev/community/vaultwarden/templates/_postgres.tpl

@@ -5,44 +5,12 @@ workload:
 
 {{/* Service */}}
 service:
-  postgres:
-    enabled: true
-    type: ClusterIP
-    targetSelector: postgres
-    ports:
-      postgres:
-        enabled: true
-        primary: true
-        port: 5432
-        targetSelector: postgres
+  {{- include "ix.v1.common.app.postgresService" $ | nindent 2 }}
+
 {{/* Persistence */}}
 persistence:
-  postgresdata:
-    enabled: true
-    type: {{ .Values.vaultwardenStorage.pgData.type }}
-    datasetName: {{ .Values.vaultwardenStorage.pgData.datasetName | default "" }}
-    hostPath: {{ .Values.vaultwardenStorage.pgData.hostPath | default "" }}
-    targetSelector:
-      # Postgres pod
-      postgres:
-        # Postgres container
-        postgres:
-          mountPath: /var/lib/postgresql/data
-        # Permissions container, for postgres, container is named "permissions"
-        permissions:
-          mountPath: /mnt/directories/postgres_data
-  postgresbackup:
-    enabled: true
-    type: {{ .Values.vaultwardenStorage.pgBackup.type }}
-    datasetName: {{ .Values.vaultwardenStorage.pgBackup.datasetName | default "" }}
-    hostPath: {{ .Values.vaultwardenStorage.pgBackup.hostPath | default "" }}
-    targetSelector:
-      # Postgres backup pod
-      postgresbackup:
-        # Postgres backup container
-        postgresbackup:
-          mountPath: /postgres_backup
-        # Permissions container, for postgres, container is named "permissions"
-        permissions:
-          mountPath: /mnt/directories/postgres_backup
+  {{- include "ix.v1.common.app.postgresPersistence"
+      (dict "pgData" .Values.vaultwardenStorage.pgData
+            "pgBackup" .Values.vaultwardenStorage.pgBackup
+      ) | nindent 2 }}
 {{- end -}}