freshrss - replace boilerplate with template

library/ix-dev/community/freshrss/Chart.lock

@@ -1,6 +1,6 @@
 dependencies:
 - name: common
   repository: file://../../../common
-  version: 1.2.0
-digest: sha256:a87a6988cedfc3f8a90eb308dffaaeaa1cbd0cad31c20e15b1147084360b9ec1
-generated: "2023-10-31T13:18:17.362686549+02:00"
+  version: 1.2.1
+digest: sha256:d695592ea5213fe64453171205ca326015d02df3888a7858becc0c733b0de4c7
+generated: "2023-11-06T19:40:33.486614163+02:00"

library/ix-dev/community/freshrss/Chart.yaml

@@ -14,7 +14,7 @@ maintainers:
 dependencies:
   - name: common
     repository: file://../../../common
-    version: 1.2.0
+    version: 1.2.1
 home: https://freshrss.org/
 icon: https://media.sys.truenas.net/apps/freshrss/icons/icon.png
 sources:

library/ix-dev/community/freshrss/templates/_persistence.tpl

@@ -63,35 +63,9 @@ persistence:
           mountPath: {{ $storage.mountPath }}
   {{- end }}
 
-  {{/* Database */}}
-  postgresdata:
-    enabled: true
-    type: {{ .Values.freshrssStorage.pgData.type }}
-    datasetName: {{ .Values.freshrssStorage.pgData.datasetName | default "" }}
-    hostPath: {{ .Values.freshrssStorage.pgData.hostPath | default "" }}
-    targetSelector:
-      # Postgres pod
-      postgres:
-        # Postgres container
-        postgres:
-          mountPath: /var/lib/postgresql/data
-        # Postgres - Permissions container
-        # Different than the 01-permissions
-        permissions:
-          mountPath: /mnt/directories/postgres_data
-  postgresbackup:
-    enabled: true
-    type: {{ .Values.freshrssStorage.pgBackup.type }}
-    datasetName: {{ .Values.freshrssStorage.pgBackup.datasetName | default "" }}
-    hostPath: {{ .Values.freshrssStorage.pgBackup.hostPath | default "" }}
-    targetSelector:
-      # Postgres backup pod
-      postgresbackup:
-        # Postgres backup container
-        postgresbackup:
-          mountPath: /postgres_backup
-        # Postgres - Permissions container
-        # Different than the 01-permissions
-        permissions:
-          mountPath: /mnt/directories/postgres_backup
+
+  {{- include "ix.v1.common.app.postgresPersistence"
+      (dict "pgData" .Values.freshrssStorage.pgData
+            "pgBackup" .Values.freshrssStorage.pgBackup
+      ) | nindent 2 }}
 {{- end -}}

library/ix-dev/community/freshrss/templates/_service.tpl

@@ -12,17 +12,6 @@ service:
         port: {{ .Values.freshrssNetwork.webPort }}
         nodePort: {{ .Values.freshrssNetwork.webPort }}
         targetSelector: freshrss
+  {{- include "ix.v1.common.app.postgresService" $ | nindent 2 }}
 
-  {{/* Database */}}
-  postgres:
-    enabled: true
-    type: ClusterIP
-    targetSelector: postgres
-    ports:
-      postgres:
-        enabled: true
-        primary: true
-        port: 5432
-        targetPort: 5432
-        targetSelector: postgres
 {{- end -}}