From bc1a6d045e723ca0a0a65388dcfb2a41133da0e0 Mon Sep 17 00:00:00 2001 From: Stavros kois Date: Sat, 18 Dec 2021 22:56:57 +0200 Subject: [PATCH 01/18] fix(paperless-ng): fix redis URL and use default paths --- charts/stable/paperless-ng/questions.yaml | 14 +++++++------- charts/stable/paperless-ng/values.yaml | 15 ++++++--------- 2 files changed, 13 insertions(+), 16 deletions(-) diff --git a/charts/stable/paperless-ng/questions.yaml b/charts/stable/paperless-ng/questions.yaml index 9023a7ddf511..b5bd6d95913a 100644 --- a/charts/stable/paperless-ng/questions.yaml +++ b/charts/stable/paperless-ng/questions.yaml @@ -206,7 +206,7 @@ questions: type: dict attrs: - variable: config - label: "App Config Storage" + label: "App Data Storage" description: "This is where paperless stores all its data (search index, classification model, etc)" schema: type: dict @@ -247,9 +247,9 @@ questions: - value: "Memory" description: "Memory" # Include{persistenceAdvanced} - - variable: static - label: "App Static Storage" - description: "This is where all static files created using “collectstatic” manager command are stored." + - variable: export + label: "App Exports files Storage" + description: "This is where exports are going." schema: type: dict attrs: @@ -258,7 +258,7 @@ questions: description: "Sets the persistence type, Anything other than PVC could break rollback!" schema: type: string - default: "simplePVC" + default: "simpleHP" enum: - value: "simplePVC" description: "PVC (simple)" @@ -290,7 +290,7 @@ questions: description: "Memory" # Include{persistenceAdvanced} - variable: consume - label: "App Data Storage" + label: "To-be consumed Document Storage" description: "This where your documents should go to be consumed." schema: type: dict @@ -332,7 +332,7 @@ questions: description: "Memory" # Include{persistenceAdvanced} - variable: media - label: "App Media Storage" + label: "App Document Storage" description: "This is where your documents and thumbnails are stored." schema: type: dict diff --git a/charts/stable/paperless-ng/values.yaml b/charts/stable/paperless-ng/values.yaml index fca22219c359..2b8ae00dff19 100644 --- a/charts/stable/paperless-ng/values.yaml +++ b/charts/stable/paperless-ng/values.yaml @@ -18,10 +18,6 @@ secret: env: PUID: 568 - PAPERLESS_DATA_DIR: "/config/" - PAPERLESS_STATICDIR: "/static/" - PAPERLESS_CONSUMPTION_DIR: "/consume/" - PAPERLESS_MEDIA_ROOT: "/media/" USERMAP_UID: "{{ .Values.env.PUID }}" USERMAP_GID: "{{ .Values.env.PGID }}" PAPERLESS_TIME_ZONE: "{{ .Values.env.TZ }}" @@ -57,21 +53,22 @@ service: persistence: config: enabled: true - mountPath: "/config" + mountPath: "/usr/src/paperless/config" consume: enabled: true - mountPath: "/consume" - static: + mountPath: "/usr/src/paperless/consume" + export: enabled: true - mountPath: "/static" + mountPath: "/usr/src/paperless/export" media: enabled: true - mountPath: "/media" + mountPath: "/usr/src/paperless/media" redis: enabled: true existingSecret: "rediscreds" redisUsername: paperless-ng + redisDatabase: "0" postgresql: enabled: true From 0481071b596cd8f3cefb2664d06df8308250da79 Mon Sep 17 00:00:00 2001 From: Stavros kois Date: Sun, 19 Dec 2021 00:54:27 +0200 Subject: [PATCH 02/18] remove `redisDatabase` as its the default on common --- charts/stable/paperless-ng/values.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/charts/stable/paperless-ng/values.yaml b/charts/stable/paperless-ng/values.yaml index 2b8ae00dff19..3626d4b10f8b 100644 --- a/charts/stable/paperless-ng/values.yaml +++ b/charts/stable/paperless-ng/values.yaml @@ -68,7 +68,6 @@ redis: enabled: true existingSecret: "rediscreds" redisUsername: paperless-ng - redisDatabase: "0" postgresql: enabled: true From 81a42ce8d0a29eb22fcad8f7bdf89ddcfd4d85dc Mon Sep 17 00:00:00 2001 From: Stavros kois Date: Mon, 20 Dec 2021 00:16:36 +0200 Subject: [PATCH 03/18] default to pvc and let users change to hostpath if they want --- charts/stable/paperless-ng/questions.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/charts/stable/paperless-ng/questions.yaml b/charts/stable/paperless-ng/questions.yaml index b5bd6d95913a..7cfe68742192 100644 --- a/charts/stable/paperless-ng/questions.yaml +++ b/charts/stable/paperless-ng/questions.yaml @@ -248,7 +248,7 @@ questions: description: "Memory" # Include{persistenceAdvanced} - variable: export - label: "App Exports files Storage" + label: "App Export files Storage" description: "This is where exports are going." schema: type: dict @@ -258,7 +258,7 @@ questions: description: "Sets the persistence type, Anything other than PVC could break rollback!" schema: type: string - default: "simpleHP" + default: "simplePVC" enum: - value: "simplePVC" description: "PVC (simple)" @@ -300,7 +300,7 @@ questions: description: "Sets the persistence type, Anything other than PVC could break rollback!" schema: type: string - default: "simpleHP" + default: "simplePVC" enum: - value: "simplePVC" description: "PVC (simple)" @@ -342,7 +342,7 @@ questions: description: "Sets the persistence type, Anything other than PVC could break rollback!" schema: type: string - default: "simpleHP" + default: "simplePVC" enum: - value: "simplePVC" description: "PVC (simple)" From e12d6202cb7ce71d6baa8651df4c3c88963a21a0 Mon Sep 17 00:00:00 2001 From: Stavros kois Date: Mon, 20 Dec 2021 00:38:41 +0200 Subject: [PATCH 04/18] paperless likes the `default` user only --- charts/stable/paperless-ng/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/stable/paperless-ng/values.yaml b/charts/stable/paperless-ng/values.yaml index 3626d4b10f8b..c4726bc67e9b 100644 --- a/charts/stable/paperless-ng/values.yaml +++ b/charts/stable/paperless-ng/values.yaml @@ -67,7 +67,7 @@ persistence: redis: enabled: true existingSecret: "rediscreds" - redisUsername: paperless-ng + redisUsername: default postgresql: enabled: true From e6ecd50f4cbfacc89eb7a93aa58a893eff68f399 Mon Sep 17 00:00:00 2001 From: Stavros kois Date: Mon, 20 Dec 2021 00:55:22 +0200 Subject: [PATCH 05/18] bump patch --- charts/stable/paperless-ng/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/stable/paperless-ng/Chart.yaml b/charts/stable/paperless-ng/Chart.yaml index ce34236cf819..55592e8f41d0 100644 --- a/charts/stable/paperless-ng/Chart.yaml +++ b/charts/stable/paperless-ng/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: paperless-ng -version: 1.0.3 +version: 1.0.4 appVersion: "1.5.0" description: Paperless-ng is an application by Daniel Quinn and contributors that indexes your scanned documents. type: application From 325ec0e4edf10e4abf4a525d43f9d3dc90a00b58 Mon Sep 17 00:00:00 2001 From: Kjeld Schouten-Lebbing Date: Mon, 20 Dec 2021 14:27:11 +0100 Subject: [PATCH 06/18] Update charts/stable/paperless-ng/values.yaml --- charts/stable/paperless-ng/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/stable/paperless-ng/values.yaml b/charts/stable/paperless-ng/values.yaml index c4726bc67e9b..cd34654675c6 100644 --- a/charts/stable/paperless-ng/values.yaml +++ b/charts/stable/paperless-ng/values.yaml @@ -19,7 +19,7 @@ secret: env: PUID: 568 USERMAP_UID: "{{ .Values.env.PUID }}" - USERMAP_GID: "{{ .Values.env.PGID }}" + USERMAP_GID: "{{ .Values.podSecurityContext.fsGroup }}" PAPERLESS_TIME_ZONE: "{{ .Values.env.TZ }}" PAPERLESS_DBNAME: "{{ .Values.postgresql.postgresqlDatabase }}" PAPERLESS_DBUSER: "{{ .Values.postgresql.postgresqlUsername }}" From d2327c7f96bc21bc0b610309ec45396ed8c52851 Mon Sep 17 00:00:00 2001 From: Kjeld Schouten-Lebbing Date: Mon, 20 Dec 2021 14:28:28 +0100 Subject: [PATCH 07/18] Update charts/stable/paperless-ng/values.yaml --- charts/stable/paperless-ng/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/stable/paperless-ng/values.yaml b/charts/stable/paperless-ng/values.yaml index cd34654675c6..8ca18ff520c4 100644 --- a/charts/stable/paperless-ng/values.yaml +++ b/charts/stable/paperless-ng/values.yaml @@ -53,7 +53,7 @@ service: persistence: config: enabled: true - mountPath: "/usr/src/paperless/config" + mountPath: "/config" consume: enabled: true mountPath: "/usr/src/paperless/consume" From 318a456af915feaf66699c37eafa5c59c5c5fa66 Mon Sep 17 00:00:00 2001 From: Kjeld Schouten-Lebbing Date: Mon, 20 Dec 2021 14:28:33 +0100 Subject: [PATCH 08/18] Update charts/stable/paperless-ng/values.yaml --- charts/stable/paperless-ng/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/stable/paperless-ng/values.yaml b/charts/stable/paperless-ng/values.yaml index 8ca18ff520c4..a0d5806ee786 100644 --- a/charts/stable/paperless-ng/values.yaml +++ b/charts/stable/paperless-ng/values.yaml @@ -59,7 +59,7 @@ persistence: mountPath: "/usr/src/paperless/consume" export: enabled: true - mountPath: "/usr/src/paperless/export" + mountPath: "/export" media: enabled: true mountPath: "/usr/src/paperless/media" From 98be0a8d4dcd92639620d97ae30de68d2603d6c2 Mon Sep 17 00:00:00 2001 From: Kjeld Schouten-Lebbing Date: Mon, 20 Dec 2021 14:28:37 +0100 Subject: [PATCH 09/18] Update charts/stable/paperless-ng/values.yaml --- charts/stable/paperless-ng/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/stable/paperless-ng/values.yaml b/charts/stable/paperless-ng/values.yaml index a0d5806ee786..16eba160e9d0 100644 --- a/charts/stable/paperless-ng/values.yaml +++ b/charts/stable/paperless-ng/values.yaml @@ -56,7 +56,7 @@ persistence: mountPath: "/config" consume: enabled: true - mountPath: "/usr/src/paperless/consume" + mountPath: "/consume" export: enabled: true mountPath: "/export" From 4e556958632f3f3ea622219e0848e1d82f886511 Mon Sep 17 00:00:00 2001 From: Kjeld Schouten-Lebbing Date: Mon, 20 Dec 2021 14:28:41 +0100 Subject: [PATCH 10/18] Update charts/stable/paperless-ng/values.yaml --- charts/stable/paperless-ng/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/stable/paperless-ng/values.yaml b/charts/stable/paperless-ng/values.yaml index 16eba160e9d0..6b3b750de08a 100644 --- a/charts/stable/paperless-ng/values.yaml +++ b/charts/stable/paperless-ng/values.yaml @@ -62,7 +62,7 @@ persistence: mountPath: "/export" media: enabled: true - mountPath: "/usr/src/paperless/media" + mountPath: "/media" redis: enabled: true From e78b78b7d518406a34b5a60c066934e78a9650bf Mon Sep 17 00:00:00 2001 From: Kjeld Schouten-Lebbing Date: Mon, 20 Dec 2021 14:29:37 +0100 Subject: [PATCH 11/18] Update charts/stable/paperless-ng/values.yaml --- charts/stable/paperless-ng/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/stable/paperless-ng/values.yaml b/charts/stable/paperless-ng/values.yaml index 6b3b750de08a..633471c90113 100644 --- a/charts/stable/paperless-ng/values.yaml +++ b/charts/stable/paperless-ng/values.yaml @@ -57,7 +57,7 @@ persistence: consume: enabled: true mountPath: "/consume" - export: + static: enabled: true mountPath: "/export" media: From 3f2865a3a6b2fb947bdee68b6b55d0a875aa8cd5 Mon Sep 17 00:00:00 2001 From: Kjeld Schouten-Lebbing Date: Mon, 20 Dec 2021 14:29:42 +0100 Subject: [PATCH 12/18] Update charts/stable/paperless-ng/values.yaml --- charts/stable/paperless-ng/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/stable/paperless-ng/values.yaml b/charts/stable/paperless-ng/values.yaml index 633471c90113..30e43b4c7b43 100644 --- a/charts/stable/paperless-ng/values.yaml +++ b/charts/stable/paperless-ng/values.yaml @@ -59,7 +59,7 @@ persistence: mountPath: "/consume" static: enabled: true - mountPath: "/export" + mountPath: "/static" media: enabled: true mountPath: "/media" From cedc8a6792bc20e347d1484d6d62dbedc839edf0 Mon Sep 17 00:00:00 2001 From: Kjeld Schouten-Lebbing Date: Mon, 20 Dec 2021 14:30:57 +0100 Subject: [PATCH 13/18] Update charts/stable/paperless-ng/questions.yaml --- charts/stable/paperless-ng/questions.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/stable/paperless-ng/questions.yaml b/charts/stable/paperless-ng/questions.yaml index 7cfe68742192..b1c2ecd1546c 100644 --- a/charts/stable/paperless-ng/questions.yaml +++ b/charts/stable/paperless-ng/questions.yaml @@ -247,9 +247,9 @@ questions: - value: "Memory" description: "Memory" # Include{persistenceAdvanced} - - variable: export - label: "App Export files Storage" - description: "This is where exports are going." + - variable: static + label: "App Static Storage" + description: ""This is where all static files created using “collectstatic” manager command are stored." schema: type: dict attrs: From 5c15b19023a359cf5db335ec4dd04ca0c335567e Mon Sep 17 00:00:00 2001 From: Kjeld Schouten-Lebbing Date: Mon, 20 Dec 2021 14:31:22 +0100 Subject: [PATCH 14/18] Update charts/stable/paperless-ng/questions.yaml --- charts/stable/paperless-ng/questions.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/stable/paperless-ng/questions.yaml b/charts/stable/paperless-ng/questions.yaml index b1c2ecd1546c..552af6ee015a 100644 --- a/charts/stable/paperless-ng/questions.yaml +++ b/charts/stable/paperless-ng/questions.yaml @@ -249,7 +249,7 @@ questions: # Include{persistenceAdvanced} - variable: static label: "App Static Storage" - description: ""This is where all static files created using “collectstatic” manager command are stored." + description: "This is where all static files created using “collectstatic” manager command are stored." schema: type: dict attrs: From 398d27c10022cb2e79cac699ce599a6ee18c6e01 Mon Sep 17 00:00:00 2001 From: Kjeld Schouten-Lebbing Date: Mon, 20 Dec 2021 14:33:41 +0100 Subject: [PATCH 15/18] Update charts/stable/paperless-ng/values.yaml --- charts/stable/paperless-ng/values.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/charts/stable/paperless-ng/values.yaml b/charts/stable/paperless-ng/values.yaml index 30e43b4c7b43..8f7db4f46793 100644 --- a/charts/stable/paperless-ng/values.yaml +++ b/charts/stable/paperless-ng/values.yaml @@ -20,6 +20,10 @@ env: PUID: 568 USERMAP_UID: "{{ .Values.env.PUID }}" USERMAP_GID: "{{ .Values.podSecurityContext.fsGroup }}" + PAPERLESS_DATA_DIR: "/config/" + PAPERLESS_STATICDIR: "/static/" + PAPERLESS_CONSUMPTION_DIR: "/consume/" + PAPERLESS_MEDIA_ROOT: "/media/" PAPERLESS_TIME_ZONE: "{{ .Values.env.TZ }}" PAPERLESS_DBNAME: "{{ .Values.postgresql.postgresqlDatabase }}" PAPERLESS_DBUSER: "{{ .Values.postgresql.postgresqlUsername }}" From 40b7a78cb080a6fc8e84c4a5e321e448a6bc712a Mon Sep 17 00:00:00 2001 From: Kjeld Schouten-Lebbing Date: Mon, 20 Dec 2021 14:34:42 +0100 Subject: [PATCH 16/18] Update charts/stable/paperless-ng/values.yaml --- charts/stable/paperless-ng/values.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/charts/stable/paperless-ng/values.yaml b/charts/stable/paperless-ng/values.yaml index 8f7db4f46793..43f9fb8ad994 100644 --- a/charts/stable/paperless-ng/values.yaml +++ b/charts/stable/paperless-ng/values.yaml @@ -18,8 +18,6 @@ secret: env: PUID: 568 - USERMAP_UID: "{{ .Values.env.PUID }}" - USERMAP_GID: "{{ .Values.podSecurityContext.fsGroup }}" PAPERLESS_DATA_DIR: "/config/" PAPERLESS_STATICDIR: "/static/" PAPERLESS_CONSUMPTION_DIR: "/consume/" From 8e36edb6b004a322e4b159500fab815f7df0772a Mon Sep 17 00:00:00 2001 From: Kjeld Schouten-Lebbing Date: Mon, 20 Dec 2021 14:34:46 +0100 Subject: [PATCH 17/18] Update charts/stable/paperless-ng/values.yaml --- charts/stable/paperless-ng/values.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/charts/stable/paperless-ng/values.yaml b/charts/stable/paperless-ng/values.yaml index 43f9fb8ad994..43a0ada5516e 100644 --- a/charts/stable/paperless-ng/values.yaml +++ b/charts/stable/paperless-ng/values.yaml @@ -22,6 +22,8 @@ env: PAPERLESS_STATICDIR: "/static/" PAPERLESS_CONSUMPTION_DIR: "/consume/" PAPERLESS_MEDIA_ROOT: "/media/" + USERMAP_UID: "{{ .Values.env.PUID }}" + USERMAP_GID: "{{ .Values.podSecurityContext.fsGroup }}" PAPERLESS_TIME_ZONE: "{{ .Values.env.TZ }}" PAPERLESS_DBNAME: "{{ .Values.postgresql.postgresqlDatabase }}" PAPERLESS_DBUSER: "{{ .Values.postgresql.postgresqlUsername }}" From 964a5f85a91b6c3812c3e466ab3ecf50884cedd0 Mon Sep 17 00:00:00 2001 From: Stavros kois Date: Mon, 20 Dec 2021 18:41:58 +0200 Subject: [PATCH 18/18] rename to `data` --- charts/stable/paperless-ng/questions.yaml | 2 +- charts/stable/paperless-ng/values.yaml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/charts/stable/paperless-ng/questions.yaml b/charts/stable/paperless-ng/questions.yaml index 552af6ee015a..d53d0b73b50a 100644 --- a/charts/stable/paperless-ng/questions.yaml +++ b/charts/stable/paperless-ng/questions.yaml @@ -205,7 +205,7 @@ questions: schema: type: dict attrs: - - variable: config + - variable: data label: "App Data Storage" description: "This is where paperless stores all its data (search index, classification model, etc)" schema: diff --git a/charts/stable/paperless-ng/values.yaml b/charts/stable/paperless-ng/values.yaml index 43a0ada5516e..076089560816 100644 --- a/charts/stable/paperless-ng/values.yaml +++ b/charts/stable/paperless-ng/values.yaml @@ -18,7 +18,7 @@ secret: env: PUID: 568 - PAPERLESS_DATA_DIR: "/config/" + PAPERLESS_DATA_DIR: "/data/" PAPERLESS_STATICDIR: "/static/" PAPERLESS_CONSUMPTION_DIR: "/consume/" PAPERLESS_MEDIA_ROOT: "/media/" @@ -55,9 +55,9 @@ service: port: 10140 persistence: - config: + data: enabled: true - mountPath: "/config" + mountPath: "/data" consume: enabled: true mountPath: "/consume"