Publish new changes in catalog

community/briefkasten/1.1.1/Chart.lock

@@ -1,6 +0,0 @@
-dependencies:
-- name: common
-  repository: file://../../../common
-  version: 1.1.1
-digest: sha256:a7dbe3e4d42dbcd4325776e5e01a1d630c7f185f79e7ebf22b1b9cc80f56eed7
-generated: "2023-09-21T17:36:42.077526429+03:00"

community/briefkasten/1.1.1/templates/_persistence.tpl

@@ -1,67 +0,0 @@
-{{- define "briefkasten.persistence" -}}
-persistence:
-  tmp:
-    enabled: true
-    type: emptyDir
-    targetSelector:
-      briefkasten:
-        briefkasten:
-          mountPath: /tmp
-  {{- range $idx, $storage := .Values.briefkastenStorage.additionalStorages }}
-  {{ printf "briefkasten-%v" (int $idx) }}:
-    {{- $size := "" -}}
-    {{- if $storage.size -}}
-      {{- $size = (printf "%vGi" $storage.size) -}}
-    {{- end }}
-    enabled: true
-    type: {{ $storage.type }}
-    datasetName: {{ $storage.datasetName | default "" }}
-    hostPath: {{ $storage.hostPath | default "" }}
-    server: {{ $storage.server | default "" }}
-    share: {{ $storage.share | default "" }}
-    domain: {{ $storage.domain | default "" }}
-    username: {{ $storage.username | default "" }}
-    password: {{ $storage.password | default "" }}
-    size: {{ $size }}
-    {{- if eq $storage.type "smb-pv-pvc" }}
-    mountOptions:
-      - key: noperm
-    {{- end }}
-    targetSelector:
-      briefkasten:
-        briefkasten:
-          mountPath: {{ $storage.mountPath }}
-  {{- end }}
-
-  {{/* Database */}}
-  postgresdata:
-    enabled: true
-    type: {{ .Values.briefkastenStorage.pgData.type }}
-    datasetName: {{ .Values.briefkastenStorage.pgData.datasetName | default "" }}
-    hostPath: {{ .Values.briefkastenStorage.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.briefkastenStorage.pgBackup.type }}
-    datasetName: {{ .Values.briefkastenStorage.pgBackup.datasetName | default "" }}
-    hostPath: {{ .Values.briefkastenStorage.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
-{{- end -}}

community/briefkasten/1.1.2/Chart.lock

@@ -0,0 +1,6 @@
+dependencies:
+- name: common
+  repository: file://../../../common
+  version: 1.2.0
+digest: sha256:a87a6988cedfc3f8a90eb308dffaaeaa1cbd0cad31c20e15b1147084360b9ec1
+generated: "2023-10-25T19:30:16.729964915+03:00"

community/briefkasten/1.1.1/Chart.yaml → community/briefkasten/1.1.2/Chart.yaml

@@ -3,7 +3,7 @@ description: Briefkasten is a self hosted bookmarking app
 annotations:
   title: Briefkasten
 type: application
-version: 1.1.1
+version: 1.1.2
 apiVersion: v2
 appVersion: latest
 kubeVersion: '>=1.16.0-0'
@@ -14,7 +14,7 @@ maintainers:
 dependencies:
   - name: common
     repository: file://../../../common
-    version: 1.1.1
+    version: 1.2.0
 home: https://github.com/ndom91/briefkasten
 icon: https://media.sys.truenas.net/apps/briefkasten/icons/icon.svg
 sources:

community/briefkasten/1.1.2/templates/_persistence.tpl

@@ -0,0 +1,40 @@
+{{- define "briefkasten.persistence" -}}
+persistence:
+  tmp:
+    enabled: true
+    type: emptyDir
+    targetSelector:
+      briefkasten:
+        briefkasten:
+          mountPath: /tmp
+  {{- range $idx, $storage := .Values.briefkastenStorage.additionalStorages }}
+  {{ printf "briefkasten-%v" (int $idx) }}:
+    {{- $size := "" -}}
+    {{- if $storage.size -}}
+      {{- $size = (printf "%vGi" $storage.size) -}}
+    {{- end }}
+    enabled: true
+    type: {{ $storage.type }}
+    datasetName: {{ $storage.datasetName | default "" }}
+    hostPath: {{ $storage.hostPath | default "" }}
+    server: {{ $storage.server | default "" }}
+    share: {{ $storage.share | default "" }}
+    domain: {{ $storage.domain | default "" }}
+    username: {{ $storage.username | default "" }}
+    password: {{ $storage.password | default "" }}
+    size: {{ $size }}
+    {{- if eq $storage.type "smb-pv-pvc" }}
+    mountOptions:
+      - key: noperm
+    {{- end }}
+    targetSelector:
+      briefkasten:
+        briefkasten:
+          mountPath: {{ $storage.mountPath }}
+  {{- end -}}
+
+  {{- include "ix.v1.common.app.postgresPersistence"
+      (dict "pgData" .Values.briefkastenStorage.pgData
+            "pgBackup" .Values.briefkastenStorage.pgBackup
+      ) | nindent 2 }}
+{{- end -}}

community/briefkasten/1.1.1/templates/_service.tpl → community/briefkasten/1.1.2/templates/_service.tpl

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