diff --git a/library/ix-dev/community/paperless-ngx/Chart.lock b/library/ix-dev/community/paperless-ngx/Chart.lock index 368a6a6cf0..47a0ce19a6 100644 --- a/library/ix-dev/community/paperless-ngx/Chart.lock +++ b/library/ix-dev/community/paperless-ngx/Chart.lock @@ -1,6 +1,6 @@ dependencies: - name: common repository: file://../../../common - version: 1.2.2 -digest: sha256:fb077cb81f6acecd5c9e6adc22a18e156f780cd78f27198cdb47810f95364b56 -generated: "2023-11-09T15:42:36.644289587+02:00" + version: 1.2.3 +digest: sha256:e6ff49b06bf5d4d159e505ae6d153f36cd46170bb519caf90462cd5caebfd0fb +generated: "2023-11-20T15:52:31.791351612+02:00" diff --git a/library/ix-dev/community/paperless-ngx/Chart.yaml b/library/ix-dev/community/paperless-ngx/Chart.yaml index 17aba0fc24..a44f83682f 100644 --- a/library/ix-dev/community/paperless-ngx/Chart.yaml +++ b/library/ix-dev/community/paperless-ngx/Chart.yaml @@ -3,7 +3,7 @@ description: Paperless-ngx is a document management system that transforms your annotations: title: Paperless-ngx type: application -version: 1.1.3 +version: 1.2.0 apiVersion: v2 appVersion: 1.17.4 kubeVersion: '>=1.16.0-0' @@ -14,7 +14,7 @@ maintainers: dependencies: - name: common repository: file://../../../common - version: 1.2.2 + version: 1.2.3 home: https://docs.paperless-ngx.com icon: https://media.sys.truenas.net/apps/paperless-ngx/icons/icon.svg sources: diff --git a/library/ix-dev/community/paperless-ngx/charts/common-1.2.2.tgz b/library/ix-dev/community/paperless-ngx/charts/common-1.2.2.tgz deleted file mode 100644 index deaad54af1..0000000000 Binary files a/library/ix-dev/community/paperless-ngx/charts/common-1.2.2.tgz and /dev/null differ diff --git a/library/ix-dev/community/paperless-ngx/charts/common-1.2.3.tgz b/library/ix-dev/community/paperless-ngx/charts/common-1.2.3.tgz new file mode 100644 index 0000000000..cf8c3aa158 Binary files /dev/null and b/library/ix-dev/community/paperless-ngx/charts/common-1.2.3.tgz differ diff --git a/library/ix-dev/community/paperless-ngx/ci/basic-values.yaml b/library/ix-dev/community/paperless-ngx/ci/basic-values.yaml index 9e82c65bd0..bb84c31bb2 100644 --- a/library/ix-dev/community/paperless-ngx/ci/basic-values.yaml +++ b/library/ix-dev/community/paperless-ngx/ci/basic-values.yaml @@ -12,20 +12,14 @@ paperlessID: paperlessStorage: data: - type: hostPath - hostPath: /mnt/{{ .Release.Namespace }}/data + type: pvc media: - type: hostPath - hostPath: /mnt/{{ .Release.Namespace }}/media + type: pvc consume: - type: hostPath - hostPath: /mnt/{{ .Release.Namespace }}/consume + type: pvc trash: - type: hostPath - hostPath: /mnt/{{ .Release.Namespace }}/trash + type: pvc pgData: - type: hostPath - hostPath: /mnt/{{ .Release.Namespace }}/pgData + type: pvc pgBackup: - type: hostPath - hostPath: /mnt/{{ .Release.Namespace }}/pgBackup + type: emptyDir diff --git a/library/ix-dev/community/paperless-ngx/ci/extra-values.yaml b/library/ix-dev/community/paperless-ngx/ci/extra-values.yaml index ac382b9923..031971dc39 100644 --- a/library/ix-dev/community/paperless-ngx/ci/extra-values.yaml +++ b/library/ix-dev/community/paperless-ngx/ci/extra-values.yaml @@ -18,27 +18,19 @@ paperlessID: paperlessStorage: data: - type: hostPath - hostPath: /mnt/{{ .Release.Namespace }}/data + type: pvc media: - type: hostPath - hostPath: /mnt/{{ .Release.Namespace }}/media + type: pvc consume: - type: hostPath - hostPath: /mnt/{{ .Release.Namespace }}/consume + type: pvc trash: - type: hostPath - hostPath: /mnt/{{ .Release.Namespace }}/trash + type: pvc pgData: - type: hostPath - hostPath: /mnt/{{ .Release.Namespace }}/pgData + type: pvc pgBackup: - type: hostPath - hostPath: /mnt/{{ .Release.Namespace }}/pgBackup + type: emptyDir additionalStorages: - - type: hostPath - hostPath: /mnt/{{ .Release.Namespace }}/data1 + - type: pvc mountPath: /data1 - - type: hostPath - hostPath: /mnt/{{ .Release.Namespace }}/data2 + - type: pvc mountPath: /data2 diff --git a/library/ix-dev/community/paperless-ngx/ci/hostNet-values.yaml b/library/ix-dev/community/paperless-ngx/ci/hostNet-values.yaml index c638b3e640..9b4d4e7b87 100644 --- a/library/ix-dev/community/paperless-ngx/ci/hostNet-values.yaml +++ b/library/ix-dev/community/paperless-ngx/ci/hostNet-values.yaml @@ -9,20 +9,14 @@ paperlessConfig: paperlessStorage: data: - type: hostPath - hostPath: /mnt/{{ .Release.Namespace }}/data + type: pvc media: - type: hostPath - hostPath: /mnt/{{ .Release.Namespace }}/media + type: pvc consume: - type: hostPath - hostPath: /mnt/{{ .Release.Namespace }}/consume + type: pvc trash: - type: hostPath - hostPath: /mnt/{{ .Release.Namespace }}/trash + type: pvc pgData: - type: hostPath - hostPath: /mnt/{{ .Release.Namespace }}/pgData + type: pvc pgBackup: - type: hostPath - hostPath: /mnt/{{ .Release.Namespace }}/pgBackup + type: emptyDir diff --git a/library/ix-dev/community/paperless-ngx/migrations/migrate b/library/ix-dev/community/paperless-ngx/migrations/migrate new file mode 100755 index 0000000000..58c2e03499 --- /dev/null +++ b/library/ix-dev/community/paperless-ngx/migrations/migrate @@ -0,0 +1,73 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def storage_migrate(storage): + delete_keys = [] + if storage['type'] == 'hostPath': + # Check if the key exists, if not we have already migrated + if not storage.get('hostPath'): + return storage + + storage['hostPathConfig'] = {'hostPath': storage['hostPath']} + delete_keys.append('hostPath') + + elif storage['type'] == 'ixVolume': + # Check if the key exists, if not we have already migrated + if not storage.get('datasetName'): + return storage + + storage['ixVolumeConfig'] = {'datasetName': storage['datasetName']} + delete_keys.append('datasetName') + + elif storage['type'] == 'smb-pv-pvc': + # Check if the key exists, if not we have already migrated + if not storage.get('server'): + return storage + + storage['smbConfig'] = { + 'server': storage['server'], + 'share': storage['share'], + 'domain': storage['domain'], + 'username': storage['username'], + 'password': storage['password'], + 'size': storage['size'], + } + delete_keys.extend(['server', 'share', 'domain', 'username', 'password', 'size']) + + for key in delete_keys: + storage.pop(key, None) + + return storage + + +def migrate(values): + storage_key = 'paperlessStorage' + storages = ['data', 'media', 'consume', 'trash', 'pgData', 'pgBackup'] + + for storage in storages: + check_val = values.get(storage_key, {}).get(storage, {}) + if not isinstance(check_val, dict) or not check_val: + raise Exception(f'Storage section {storage} is malformed') + + values[storage_key][storage] = storage_migrate(check_val) + + additionalStorages = values.get(storage_key, {}).get('additionalStorages', []) + for idx, storage in enumerate(additionalStorages): + if not isinstance(storage, dict) or not storage: + raise Exception(f'Item {idx} in additionalStorages is malformed') + + values[storage_key]['additionalStorages'][idx] = storage_migrate(storage) + + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/library/ix-dev/community/paperless-ngx/questions.yaml b/library/ix-dev/community/paperless-ngx/questions.yaml index 84f55f7580..2a876820fc 100644 --- a/library/ix-dev/community/paperless-ngx/questions.yaml +++ b/library/ix-dev/community/paperless-ngx/questions.yaml @@ -172,24 +172,65 @@ questions: description: Host Path (Path that already exists on the system) - value: "ixVolume" description: ixVolume (Dataset created automatically by the system) - - variable: datasetName - label: Dataset Name + - variable: ixVolumeConfig + label: ixVolume Configuration + description: The configuration for the ixVolume dataset. schema: - type: string + type: dict show_if: [["type", "=", "ixVolume"]] - required: true - hidden: true - immutable: true - default: "data" $ref: - "normalize/ixVolume" - - variable: hostPath - label: Host Path + attrs: + - variable: aclEnable + label: Enable ACL + description: Enable ACL for the dataset. + schema: + type: boolean + default: false + - variable: datasetName + label: Dataset Name + description: The name of the dataset to use for storage. + schema: + type: string + required: true + immutable: true + hidden: true + default: "data" + - variable: aclEntries + label: ACL Configuration + schema: + type: dict + show_if: [["aclEnable", "=", true]] + attrs: [] + - variable: hostPathConfig + label: hostPathConfig schema: - type: hostpath + type: dict show_if: [["type", "=", "hostPath"]] - immutable: true - required: true + attrs: + - variable: aclEnable + label: Enable ACL + description: Enable ACL for the dataset. + schema: + type: boolean + default: false + - variable: acl + label: ACL Configuration + schema: + type: dict + show_if: [["aclEnable", "=", true]] + attrs: [] + $ref: + - "normalize/acl" + - variable: hostPath + label: Host Path + description: The host path to use for storage. + schema: + type: hostpath + show_if: [["aclEnable", "=", false]] + immutable: true + required: true + - variable: media label: Paperless-ngx Media Storage description: The path to store Paperless-ngx Media. @@ -211,24 +252,65 @@ questions: description: Host Path (Path that already exists on the system) - value: "ixVolume" description: ixVolume (Dataset created automatically by the system) - - variable: datasetName - label: Dataset Name + - variable: ixVolumeConfig + label: ixVolume Configuration + description: The configuration for the ixVolume dataset. schema: - type: string + type: dict show_if: [["type", "=", "ixVolume"]] - required: true - hidden: true - immutable: true - default: "media" $ref: - "normalize/ixVolume" - - variable: hostPath - label: Host Path + attrs: + - variable: aclEnable + label: Enable ACL + description: Enable ACL for the dataset. + schema: + type: boolean + default: false + - variable: datasetName + label: Dataset Name + description: The name of the dataset to use for storage. + schema: + type: string + required: true + immutable: true + hidden: true + default: "media" + - variable: aclEntries + label: ACL Configuration + schema: + type: dict + show_if: [["aclEnable", "=", true]] + attrs: [] + - variable: hostPathConfig + label: hostPathConfig schema: - type: hostpath + type: dict show_if: [["type", "=", "hostPath"]] - immutable: true - required: true + attrs: + - variable: aclEnable + label: Enable ACL + description: Enable ACL for the dataset. + schema: + type: boolean + default: false + - variable: acl + label: ACL Configuration + schema: + type: dict + show_if: [["aclEnable", "=", true]] + attrs: [] + $ref: + - "normalize/acl" + - variable: hostPath + label: Host Path + description: The host path to use for storage. + schema: + type: hostpath + show_if: [["aclEnable", "=", false]] + immutable: true + required: true + - variable: consume label: Paperless-ngx Consumption Storage description: The path to store Paperless-ngx Data for Consumption. @@ -250,24 +332,64 @@ questions: description: Host Path (Path that already exists on the system) - value: "ixVolume" description: ixVolume (Dataset created automatically by the system) - - variable: datasetName - label: Dataset Name + - variable: ixVolumeConfig + label: ixVolume Configuration + description: The configuration for the ixVolume dataset. schema: - type: string + type: dict show_if: [["type", "=", "ixVolume"]] - required: true - hidden: true - immutable: true - default: "consume" $ref: - "normalize/ixVolume" - - variable: hostPath - label: Host Path + attrs: + - variable: aclEnable + label: Enable ACL + description: Enable ACL for the dataset. + schema: + type: boolean + default: false + - variable: datasetName + label: Dataset Name + description: The name of the dataset to use for storage. + schema: + type: string + required: true + immutable: true + hidden: true + default: "consume" + - variable: aclEntries + label: ACL Configuration + schema: + type: dict + show_if: [["aclEnable", "=", true]] + attrs: [] + - variable: hostPathConfig + label: hostPathConfig schema: - type: hostpath + type: dict show_if: [["type", "=", "hostPath"]] - immutable: true - required: true + attrs: + - variable: aclEnable + label: Enable ACL + description: Enable ACL for the dataset. + schema: + type: boolean + default: false + - variable: acl + label: ACL Configuration + schema: + type: dict + show_if: [["aclEnable", "=", true]] + attrs: [] + $ref: + - "normalize/acl" + - variable: hostPath + label: Host Path + description: The host path to use for storage. + schema: + type: hostpath + show_if: [["aclEnable", "=", false]] + immutable: true + required: true - variable: trash label: Paperless-ngx Trash Storage description: | @@ -291,24 +413,64 @@ questions: description: Host Path (Path that already exists on the system) - value: "ixVolume" description: ixVolume (Dataset created automatically by the system) - - variable: datasetName - label: Dataset Name + - variable: ixVolumeConfig + label: ixVolume Configuration + description: The configuration for the ixVolume dataset. schema: - type: string + type: dict show_if: [["type", "=", "ixVolume"]] - required: true - hidden: true - immutable: true - default: "trash" $ref: - "normalize/ixVolume" - - variable: hostPath - label: Host Path + attrs: + - variable: aclEnable + label: Enable ACL + description: Enable ACL for the dataset. + schema: + type: boolean + default: false + - variable: datasetName + label: Dataset Name + description: The name of the dataset to use for storage. + schema: + type: string + required: true + immutable: true + hidden: true + default: "trash" + - variable: aclEntries + label: ACL Configuration + schema: + type: dict + show_if: [["aclEnable", "=", true]] + attrs: [] + - variable: hostPathConfig + label: hostPathConfig schema: - type: hostpath + type: dict show_if: [["type", "=", "hostPath"]] - immutable: true - required: true + attrs: + - variable: aclEnable + label: Enable ACL + description: Enable ACL for the dataset. + schema: + type: boolean + default: false + - variable: acl + label: ACL Configuration + schema: + type: dict + show_if: [["aclEnable", "=", true]] + attrs: [] + $ref: + - "normalize/acl" + - variable: hostPath + label: Host Path + description: The host path to use for storage. + schema: + type: hostpath + show_if: [["aclEnable", "=", false]] + immutable: true + required: true - variable: pgData label: Paperless-ngx Postgres Data Storage @@ -331,24 +493,73 @@ questions: description: Host Path (Path that already exists on the system) - value: ixVolume description: ixVolume (Dataset created automatically by the system) - - variable: datasetName - label: Dataset Name + - variable: ixVolumeConfig + label: ixVolume Configuration + description: The configuration for the ixVolume dataset. schema: - type: string - show_if: [["type", "=", "ixVolume"]] - required: true + type: dict + # Nothing to show for the user hidden: true - immutable: true - default: pgData + show_if: [["type", "=", "ixVolume"]] $ref: - "normalize/ixVolume" - - variable: hostPath - label: Host Path + attrs: + - variable: aclEnable + label: Enable ACL + description: Enable ACL for the dataset. + schema: + type: boolean + # Postgres does a CHMOD at startup + # Which fails with ACL + hidden: true + default: false + - variable: datasetName + label: Dataset Name + description: The name of the dataset to use for storage. + schema: + type: string + required: true + immutable: true + hidden: true + default: "pgData" + - variable: aclEntries + label: ACL Configuration + schema: + type: dict + show_if: [["aclEnable", "=", true]] + attrs: [] + - variable: hostPathConfig + label: hostPathConfig schema: - type: hostpath + type: dict show_if: [["type", "=", "hostPath"]] - immutable: true - required: true + attrs: + - variable: aclEnable + label: Enable ACL + description: Enable ACL for the dataset. + schema: + type: boolean + # Postgres does a CHMOD at startup + # Which fails with ACL + hidden: true + default: false + - variable: acl + label: ACL Configuration + schema: + type: dict + show_if: [["aclEnable", "=", true]] + attrs: [] + $ref: + - "normalize/acl" + - variable: hostPath + label: Host Path + description: The host path to use for storage. + schema: + type: hostpath + show_if: [["aclEnable", "=", false]] + immutable: true + required: true + - variable: pgBackup label: Paperless-ngx Postgres Backup Storage description: The path to store Paperless-ngx Postgres Backup. @@ -370,24 +581,72 @@ questions: description: Host Path (Path that already exists on the system) - value: ixVolume description: ixVolume (Dataset created automatically by the system) - - variable: datasetName - label: Dataset Name + - variable: ixVolumeConfig + label: ixVolume Configuration + description: The configuration for the ixVolume dataset. schema: - type: string - show_if: [["type", "=", "ixVolume"]] - required: true + type: dict + # Nothing to show for the user hidden: true - immutable: true - default: pgBackup + show_if: [["type", "=", "ixVolume"]] $ref: - "normalize/ixVolume" - - variable: hostPath - label: Host Path + attrs: + - variable: aclEnable + label: Enable ACL + description: Enable ACL for the dataset. + schema: + type: boolean + # Postgres does a CHMOD at startup + # Which fails with ACL + hidden: true + default: false + - variable: datasetName + label: Dataset Name + description: The name of the dataset to use for storage. + schema: + type: string + required: true + immutable: true + hidden: true + default: "pgBackup" + - variable: aclEntries + label: ACL Configuration + schema: + type: dict + show_if: [["aclEnable", "=", true]] + attrs: [] + - variable: hostPathConfig + label: hostPathConfig schema: - type: hostpath + type: dict show_if: [["type", "=", "hostPath"]] - immutable: true - required: true + attrs: + - variable: aclEnable + label: Enable ACL + description: Enable ACL for the dataset. + schema: + type: boolean + # Postgres does a CHMOD at startup + # Which fails with ACL + hidden: true + default: false + - variable: acl + label: ACL Configuration + schema: + type: dict + show_if: [["aclEnable", "=", true]] + attrs: [] + $ref: + - "normalize/acl" + - variable: hostPath + label: Host Path + description: The host path to use for storage. + schema: + type: hostpath + show_if: [["aclEnable", "=", false]] + immutable: true + required: true - variable: additionalStorages label: Additional Storage @@ -419,74 +678,120 @@ questions: description: ixVolume (Dataset created automatically by the system) - value: "smb-pv-pvc" description: SMB Share (Mounts a persistent volume claim to a SMB share) + - variable: readOnly + label: Read Only + description: Mount the volume as read only. + schema: + type: boolean + default: false - variable: mountPath label: Mount Path description: The path inside the container to mount the storage. schema: type: path required: true - - variable: hostPath - label: Host Path - description: The host path to use for storage. + - variable: hostPathConfig + label: hostPathConfig schema: - type: hostpath + type: dict show_if: [["type", "=", "hostPath"]] - required: true - - variable: datasetName - label: Dataset Name - description: The name of the dataset to use for storage. + attrs: + - variable: aclEnable + label: Enable ACL + description: Enable ACL for the dataset. + schema: + type: boolean + default: false + - variable: acl + label: ACL Configuration + schema: + type: dict + show_if: [["aclEnable", "=", true]] + attrs: [] + $ref: + - "normalize/acl" + - variable: hostPath + label: Host Path + description: The host path to use for storage. + schema: + type: hostpath + show_if: [["aclEnable", "=", false]] + immutable: true + required: true + - variable: ixVolumeConfig + label: ixVolume Configuration + description: The configuration for the ixVolume dataset. schema: - type: string + type: dict show_if: [["type", "=", "ixVolume"]] - required: true - immutable: true - default: "storage_entry" $ref: - "normalize/ixVolume" - - variable: server - label: Server - description: The server for the SMB share. + attrs: + - variable: aclEnable + label: Enable ACL + description: Enable ACL for the dataset. + schema: + type: boolean + default: false + - variable: datasetName + label: Dataset Name + description: The name of the dataset to use for storage. + schema: + type: string + required: true + immutable: true + default: "storage_entry" + - variable: aclEntries + label: ACL Configuration + schema: + type: dict + show_if: [["aclEnable", "=", true]] + attrs: [] + - variable: smbConfig + label: SMB Share Configuration + description: The configuration for the SMB Share. schema: - type: string + type: dict show_if: [["type", "=", "smb-pv-pvc"]] - required: true - - variable: share - label: Share - description: The share name for the SMB share. - schema: - type: string - show_if: [["type", "=", "smb-pv-pvc"]] - required: true - - variable: domain - label: Domain (Optional) - description: The domain for the SMB share. - schema: - type: string - show_if: [["type", "=", "smb-pv-pvc"]] - - variable: username - label: Username - description: The username for the SMB share. - schema: - type: string - show_if: [["type", "=", "smb-pv-pvc"]] - required: true - - variable: password - label: Password - description: The password for the SMB share. - schema: - type: string - show_if: [["type", "=", "smb-pv-pvc"]] - required: true - private: true - - variable: size - label: Size (in Gi) - description: The size of the volume quota. - schema: - type: int - show_if: [["type", "=", "smb-pv-pvc"]] - required: true - min: 1 - default: 1 + attrs: + - variable: server + label: Server + description: The server for the SMB share. + schema: + type: string + required: true + - variable: share + label: Share + description: The share name for the SMB share. + schema: + type: string + required: true + - variable: domain + label: Domain (Optional) + description: The domain for the SMB share. + schema: + type: string + - variable: username + label: Username + description: The username for the SMB share. + schema: + type: string + required: true + - variable: password + label: Password + description: The password for the SMB share. + schema: + type: string + required: true + private: true + - variable: size + label: Size (in Gi) + description: The size of the volume quota. + schema: + type: int + required: true + min: 1 + default: 1 - variable: resources group: Resources Configuration diff --git a/library/ix-dev/community/paperless-ngx/templates/_paperless.tpl b/library/ix-dev/community/paperless-ngx/templates/_paperless.tpl index cf691ce218..f8fa6cb50d 100644 --- a/library/ix-dev/community/paperless-ngx/templates/_paperless.tpl +++ b/library/ix-dev/community/paperless-ngx/templates/_paperless.tpl @@ -52,14 +52,6 @@ workload: port: {{ .Values.paperlessNetwork.webPort }} path: / initContainers: - {{- if .Values.paperlessConfig.enableTrash }} - {{/* Paperless entrypoint never chowns the trash and fails if the permissions are wrong */}} - {{- include "ix.v1.common.app.permissions" (dict "containerName" "01-permissions" - "UID" .Values.paperlessID.user - "GID" .Values.paperlessID.group - "mode" "check" - "type" "init") | nindent 8 }} - {{- end }} {{- include "ix.v1.common.app.redisWait" (dict "name" "02-redis-wait" "secretName" "redis-creds") | nindent 8 }} {{- include "ix.v1.common.app.postgresWait" (dict "name" "03-postgres-wait" diff --git a/library/ix-dev/community/paperless-ngx/templates/_persistence.tpl b/library/ix-dev/community/paperless-ngx/templates/_persistence.tpl index 01c2a2e2af..12a907a45a 100644 --- a/library/ix-dev/community/paperless-ngx/templates/_persistence.tpl +++ b/library/ix-dev/community/paperless-ngx/templates/_persistence.tpl @@ -2,42 +2,36 @@ persistence: data: enabled: true - type: {{ .Values.paperlessStorage.data.type }} - datasetName: {{ .Values.paperlessStorage.data.datasetName | default "" }} - hostPath: {{ .Values.paperlessStorage.data.hostPath | default "" }} + {{- include "paperless.storage.ci.migration" (dict "storage" .Values.paperlessStorage.data) }} + {{- include "ix.v1.common.app.storageOptions" (dict "storage" .Values.paperlessStorage.data) | nindent 4 }} targetSelector: paperless: paperless: mountPath: /usr/src/paperless/data media: enabled: true - type: {{ .Values.paperlessStorage.media.type }} - datasetName: {{ .Values.paperlessStorage.media.datasetName | default "" }} - hostPath: {{ .Values.paperlessStorage.media.hostPath | default "" }} + {{- include "paperless.storage.ci.migration" (dict "storage" .Values.paperlessStorage.media) }} + {{- include "ix.v1.common.app.storageOptions" (dict "storage" .Values.paperlessStorage.media) | nindent 4 }} targetSelector: paperless: paperless: mountPath: /usr/src/paperless/media consume: enabled: true - type: {{ .Values.paperlessStorage.consume.type }} - datasetName: {{ .Values.paperlessStorage.consume.datasetName | default "" }} - hostPath: {{ .Values.paperlessStorage.consume.hostPath | default "" }} + {{- include "paperless.storage.ci.migration" (dict "storage" .Values.paperlessStorage.consume) }} + {{- include "ix.v1.common.app.storageOptions" (dict "storage" .Values.paperlessStorage.consume) | nindent 4 }} targetSelector: paperless: paperless: mountPath: /usr/src/paperless/consume trash: enabled: true - type: {{ .Values.paperlessStorage.trash.type }} - datasetName: {{ .Values.paperlessStorage.trash.datasetName | default "" }} - hostPath: {{ .Values.paperlessStorage.trash.hostPath | default "" }} + {{- include "paperless.storage.ci.migration" (dict "storage" .Values.paperlessStorage.trash) }} + {{- include "ix.v1.common.app.storageOptions" (dict "storage" .Values.paperlessStorage.trash) | nindent 4 }} targetSelector: paperless: paperless: mountPath: /usr/src/paperless/trash - 01-permissions: - mountPath: /mnt/directories/trash tmp: enabled: true type: emptyDir @@ -46,33 +40,30 @@ persistence: paperless: mountPath: /tmp {{- range $idx, $storage := .Values.paperlessStorage.additionalStorages }} - {{ printf "paperless-%v" (int $idx) }}: - {{- $size := "" -}} - {{- if $storage.size -}} - {{- $size = (printf "%vGi" $storage.size) -}} - {{- end }} + {{ printf "paperless-%v:" (int $idx) }} 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 }} + {{- include "paperless.storage.ci.migration" (dict "storage" $storage) }} + {{- include "ix.v1.common.app.storageOptions" (dict "storage" $storage) | nindent 4 }} targetSelector: paperless: paperless: mountPath: {{ $storage.mountPath }} {{- end }} + {{- include "paperless.storage.ci.migration" (dict "storage" .Values.paperlessStorage.pgData) }} + {{- include "paperless.storage.ci.migration" (dict "storage" .Values.paperlessStorage.pgBackup) }} {{- include "ix.v1.common.app.postgresPersistence" (dict "pgData" .Values.paperlessStorage.pgData "pgBackup" .Values.paperlessStorage.pgBackup ) | nindent 2 }} {{- end -}} + +{{/* TODO: Remove on the next version bump, eg 1.2.0+ */}} +{{- define "paperless.storage.ci.migration" -}} + {{- $storage := .storage -}} + + {{- if $storage.hostPath -}} + {{- $_ := set $storage "hostPathConfig" dict -}} + {{- $_ := set $storage.hostPathConfig "hostPath" $storage.hostPath -}} + {{- end -}} +{{- end -}} diff --git a/library/ix-dev/community/paperless-ngx/values.yaml b/library/ix-dev/community/paperless-ngx/values.yaml index ad600ae8fa..d576d7a7a9 100644 --- a/library/ix-dev/community/paperless-ngx/values.yaml +++ b/library/ix-dev/community/paperless-ngx/values.yaml @@ -26,22 +26,28 @@ paperlessID: paperlessStorage: data: type: ixVolume - datasetName: data + ixVolumeConfig: + datasetName: data media: type: ixVolume - datasetName: media + ixVolumeConfig: + datasetName: media consume: type: ixVolume - datasetName: consume + ixVolumeConfig: + datasetName: consume trash: type: ixVolume - datasetName: trash + ixVolumeConfig: + datasetName: trash pgData: type: ixVolume - datasetName: pgData + ixVolumeConfig: + datasetName: pgData pgBackup: type: ixVolume - datasetName: pgBackup + ixVolumeConfig: + datasetName: pgBackup additionalStorages: [] notes: