diff --git a/library/ix-dev/community/listmonk/Chart.lock b/library/ix-dev/community/listmonk/Chart.lock index 4c0ba97d58..0f1c4154db 100644 --- a/library/ix-dev/community/listmonk/Chart.lock +++ b/library/ix-dev/community/listmonk/Chart.lock @@ -1,6 +1,6 @@ dependencies: - name: common repository: file://../../../common - version: 1.1.1 -digest: sha256:a7dbe3e4d42dbcd4325776e5e01a1d630c7f185f79e7ebf22b1b9cc80f56eed7 -generated: "2023-10-11T15:34:06.716391369+03:00" + version: 1.2.1 +digest: sha256:d695592ea5213fe64453171205ca326015d02df3888a7858becc0c733b0de4c7 +generated: "2023-11-06T19:48:12.230410612+02:00" diff --git a/library/ix-dev/community/listmonk/Chart.yaml b/library/ix-dev/community/listmonk/Chart.yaml index 05d3a523d9..af901778ce 100644 --- a/library/ix-dev/community/listmonk/Chart.yaml +++ b/library/ix-dev/community/listmonk/Chart.yaml @@ -3,7 +3,7 @@ description: Listmonk is a self-hosted newsletter and mailing list manager. annotations: title: Listmonk type: application -version: 1.1.1 +version: 1.1.2 apiVersion: v2 appVersion: v2.5.1 kubeVersion: '>=1.16.0-0' @@ -14,7 +14,7 @@ maintainers: dependencies: - name: common repository: file://../../../common - version: 1.1.1 + version: 1.2.1 home: https://listmonk.app/ icon: https://media.sys.truenas.net/apps/listmonk/icons/icon.svg sources: diff --git a/library/ix-dev/community/listmonk/charts/common-1.1.1.tgz b/library/ix-dev/community/listmonk/charts/common-1.1.1.tgz deleted file mode 100644 index ee54ba6d11..0000000000 Binary files a/library/ix-dev/community/listmonk/charts/common-1.1.1.tgz and /dev/null differ diff --git a/library/ix-dev/community/listmonk/charts/common-1.2.1.tgz b/library/ix-dev/community/listmonk/charts/common-1.2.1.tgz new file mode 100644 index 0000000000..df999dd037 Binary files /dev/null and b/library/ix-dev/community/listmonk/charts/common-1.2.1.tgz differ diff --git a/library/ix-dev/community/listmonk/templates/_persistence.tpl b/library/ix-dev/community/listmonk/templates/_persistence.tpl index 5cb5653cb3..27dba34179 100644 --- a/library/ix-dev/community/listmonk/templates/_persistence.tpl +++ b/library/ix-dev/community/listmonk/templates/_persistence.tpl @@ -44,35 +44,8 @@ persistence: mountPath: {{ $storage.mountPath }} {{- end -}} - {{/* Database */}} - postgresdata: - enabled: true - type: {{ .Values.listmonkStorage.pgData.type }} - datasetName: {{ .Values.listmonkStorage.pgData.datasetName | default "" }} - hostPath: {{ .Values.listmonkStorage.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.listmonkStorage.pgBackup.type }} - datasetName: {{ .Values.listmonkStorage.pgBackup.datasetName | default "" }} - hostPath: {{ .Values.listmonkStorage.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.listmonkStorage.pgData + "pgBackup" .Values.listmonkStorage.pgBackup + ) | nindent 2 }} {{- end -}} diff --git a/library/ix-dev/community/listmonk/templates/_service.tpl b/library/ix-dev/community/listmonk/templates/_service.tpl index 7384145869..ace84af845 100644 --- a/library/ix-dev/community/listmonk/templates/_service.tpl +++ b/library/ix-dev/community/listmonk/templates/_service.tpl @@ -12,15 +12,6 @@ service: port: {{ .Values.listmonkNetwork.webPort }} nodePort: {{ .Values.listmonkNetwork.webPort }} targetSelector: listmonk - 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 -}}