From 3abce5f8d53d18de0ce90cd19594336df0aa1ab9 Mon Sep 17 00:00:00 2001 From: Jonathan Scott Bartlett <34320158+Jonnobrow@users.noreply.github.com> Date: Mon, 18 Oct 2021 18:28:25 +0100 Subject: [PATCH] [paperless] Added in postgres and redis as dependencies (#1237) * [paperless] Added in postgres and redis as dependencies Signed-off-by: Jonathan Bartlett --- charts/stable/paperless/Chart.yaml | 14 +++++++-- charts/stable/paperless/README.md | 20 +++++++++---- .../paperless/README_CHANGELOG.md.gotmpl | 8 +++++ .../stable/paperless/README_CONFIG.md.gotmpl | 1 - charts/stable/paperless/ci/ct-values.yaml | 13 ++++++++ charts/stable/paperless/values.yaml | 30 ++++++++++++++----- 6 files changed, 70 insertions(+), 16 deletions(-) diff --git a/charts/stable/paperless/Chart.yaml b/charts/stable/paperless/Chart.yaml index 757f2cc9..6bda7f52 100644 --- a/charts/stable/paperless/Chart.yaml +++ b/charts/stable/paperless/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 -appVersion: 1.0.0 +appVersion: 1.5.0 description: Paperless - Index and archive all of your scanned paper documents name: paperless -version: 7.0.1 +version: 8.0.0 kubeVersion: ">=1.16.0-0" keywords: - paperless @@ -12,7 +12,17 @@ sources: - https://github.com/jonaswinkler/paperless-ng maintainers: - name: mr-onion-2 +- name: jonnobrow + email: jonathan@jonnobrow.co.uk dependencies: - name: common repository: https://library-charts.k8s-at-home.com version: 4.0.1 +- name: postgresql + version: 10.12.2 + repository: https://charts.bitnami.com/bitnami + condition: postgresql.enabled +- name: redis + version: 15.0.0 + repository: https://charts.bitnami.com/bitnami + condition: redis.enabled diff --git a/charts/stable/paperless/README.md b/charts/stable/paperless/README.md index c587f1e8..fd4ed079 100644 --- a/charts/stable/paperless/README.md +++ b/charts/stable/paperless/README.md @@ -1,6 +1,6 @@ # paperless -![Version: 7.0.1](https://img.shields.io/badge/Version-7.0.1-informational?style=flat-square) ![AppVersion: 1.0.0](https://img.shields.io/badge/AppVersion-1.0.0-informational?style=flat-square) +![Version: 8.0.0](https://img.shields.io/badge/Version-8.0.0-informational?style=flat-square) ![AppVersion: 1.5.0](https://img.shields.io/badge/AppVersion-1.5.0-informational?style=flat-square) Paperless - Index and archive all of your scanned paper documents @@ -18,6 +18,8 @@ Kubernetes: `>=1.16.0-0` | Repository | Name | Version | |------------|------|---------| +| https://charts.bitnami.com/bitnami | postgresql | 10.12.2 | +| https://charts.bitnami.com/bitnami | redis | 15.0.0 | | https://library-charts.k8s-at-home.com | common | 4.0.1 | ## TL;DR @@ -66,7 +68,6 @@ helm install paperless k8s-at-home/paperless -f values.yaml ``` ## Custom configuration - N/A ## Values @@ -75,19 +76,20 @@ N/A | Key | Type | Default | Description | |-----|------|---------|-------------| -| additionalContainers | object | See values.yaml | Deploy local redis instance. | | env | object | See below | See the following files for additional environment variables: https://github.com/jonaswinkler/paperless-ng/tree/master/docker/compose/ https://github.com/jonaswinkler/paperless-ng/blob/master/paperless.conf.example | | env.COMPOSE_PROJECT_NAME | string | `"paperless"` | Project name | | env.PAPERLESS_OCR_LANGUAGE | string | `"eng"` | OCR languages to install | -| env.PAPERLESS_REDIS | string | `"redis://localhost:6379"` | Redis to use | +| env.PAPERLESS_REDIS | string | `nil` | Redis to use | | image.pullPolicy | string | `"IfNotPresent"` | image pull policy | | image.repository | string | `"jonaswinkler/paperless-ng"` | image repository | -| image.tag | string | `"1.4.5"` | image tag | +| image.tag | string | `"1.5.0"` | image tag | | ingress.main | object | See values.yaml | Enable and configure ingress settings for the chart under this key. | | persistence.consume | object | See values.yaml | Configure volume to monitor for new documents. | | persistence.data | object | See values.yaml | Configure persistence for data. | | persistence.export | object | See values.yaml | Configure export volume. | | persistence.media | object | See values.yaml | Configure persistence for media. | +| postgresql | object | See values.yaml | Enable and configure postgresql database subchart under this key. For more options see [postgresql chart documentation](https://github.com/bitnami/charts/tree/master/bitnami/postgresql) | +| redis | object | See values.yaml | Enable and configure redis subchart under this key. For more options see [redis chart documentation](https://github.com/bitnami/charts/tree/master/bitnami/redis) | | service | object | See values.yaml | Configures service settings for the chart. | ## Changelog @@ -96,6 +98,14 @@ All notable changes to this application Helm chart will be documented in this fi The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +### [8.0.0] + +#### Changed + +- Upgraded the App Version to `1.5.0` +- Changed the image tag to `1.5.0` +- Include postgresql and redis charts from bitnami as Paperless supports both of these. This adds two new configuration sections and can replace the additionalContainers used for redis previously. + ### [7.0.0] #### Changed diff --git a/charts/stable/paperless/README_CHANGELOG.md.gotmpl b/charts/stable/paperless/README_CHANGELOG.md.gotmpl index 3c7123e2..89c5757f 100644 --- a/charts/stable/paperless/README_CHANGELOG.md.gotmpl +++ b/charts/stable/paperless/README_CHANGELOG.md.gotmpl @@ -9,6 +9,14 @@ All notable changes to this application Helm chart will be documented in this fi The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +### [8.0.0] + +#### Changed + +- Upgraded the App Version to `1.5.0` +- Changed the image tag to `1.5.0` +- Include postgresql and redis charts from bitnami as Paperless supports both of these. This adds two new configuration sections and can replace the additionalContainers used for redis previously. + ### [7.0.0] #### Changed diff --git a/charts/stable/paperless/README_CONFIG.md.gotmpl b/charts/stable/paperless/README_CONFIG.md.gotmpl index e93d80bf..ba63bd5f 100644 --- a/charts/stable/paperless/README_CONFIG.md.gotmpl +++ b/charts/stable/paperless/README_CONFIG.md.gotmpl @@ -4,6 +4,5 @@ {{- define "custom.custom.configuration" -}} {{ template "custom.custom.configuration.header" . }} - N/A {{- end -}} diff --git a/charts/stable/paperless/ci/ct-values.yaml b/charts/stable/paperless/ci/ct-values.yaml index ba072985..3af93088 100644 --- a/charts/stable/paperless/ci/ct-values.yaml +++ b/charts/stable/paperless/ci/ct-values.yaml @@ -1,3 +1,6 @@ +env: + PAPERLESS_REDIS: redis://paperless-redis-headless:6379 + persistence: data: enabled: true @@ -11,3 +14,13 @@ persistence: export: enabled: true type: emptyDir + +redis: + enabled: true + architecture: standalone + auth: + enabled: false + master: + persistence: + enabled: false + fullnameOverride: paperless-redis diff --git a/charts/stable/paperless/values.yaml b/charts/stable/paperless/values.yaml index 4cbe8190..e5080247 100644 --- a/charts/stable/paperless/values.yaml +++ b/charts/stable/paperless/values.yaml @@ -11,7 +11,7 @@ image: # -- image pull policy pullPolicy: IfNotPresent # -- image tag - tag: 1.4.5 + tag: 1.5.0 # -- See the following files for additional environment variables: # https://github.com/jonaswinkler/paperless-ng/tree/master/docker/compose/ @@ -21,12 +21,14 @@ env: # -- Project name COMPOSE_PROJECT_NAME: paperless # -- Redis to use - PAPERLESS_REDIS: redis://localhost:6379 + PAPERLESS_REDIS: # -- OCR languages to install PAPERLESS_OCR_LANGUAGE: eng # USERMAP_UID: 1000 # USERMAP_GID: 1000 # PAPERLESS_TIME_ZONE: Europe/London + # -- Database host to use + PAPERLESS_DBHOST: # -- Configures service settings for the chart. # @default -- See values.yaml @@ -76,10 +78,22 @@ persistence: emptyDir: enabled: false -# -- Deploy local redis instance. +# -- Enable and configure postgresql database subchart under this key. +# For more options see [postgresql chart documentation](https://github.com/bitnami/charts/tree/master/bitnami/postgresql) # @default -- See values.yaml -additionalContainers: - broker: - name: broker - image: redis:6.0 - imagePullPolicy: IfNotPresent +postgresql: + enabled: false + postgresqlUsername: paperless + postgresqlPassword: paperless + postgresqlDatabase: paperless + persistence: + enabled: false + # storageClass: "" + +# -- Enable and configure redis subchart under this key. +# For more options see [redis chart documentation](https://github.com/bitnami/charts/tree/master/bitnami/redis) +# @default -- See values.yaml +redis: + enabled: false + auth: + enabled: false