patch-paperless #40

Merged
marko merged 4 commits from patch-paperless into main 2025-11-23 13:06:37 +00:00
3 changed files with 47 additions and 48 deletions

View File

@@ -4,7 +4,7 @@ description: "A community-supported supercharged version of paperless: scan, ind
home: https://charts.gabe565.com/charts/paperless-ngx/ home: https://charts.gabe565.com/charts/paperless-ngx/
icon: https://raw.githubusercontent.com/paperless-ngx/paperless-ngx/b948750/src-ui/src/assets/logo-notext.svg icon: https://raw.githubusercontent.com/paperless-ngx/paperless-ngx/b948750/src-ui/src/assets/logo-notext.svg
type: application type: application
version: 0.25.1 version: 0.25.0
# renovate datasource=docker depName=ghcr.io/paperless-ngx/paperless-ngx # renovate datasource=docker depName=ghcr.io/paperless-ngx/paperless-ngx
appVersion: 2.20.0 appVersion: 2.20.0
kubeVersion: ">=1.28.0-0" kubeVersion: ">=1.28.0-0"

View File

@@ -1,50 +1,50 @@
{{/* Append the hardcoded settings */}} {{/* Append the hardcoded settings */}}
{{- define "healthchecks.harcodedValues" -}} {{- define "healthchecks.harcodedValues" -}}
env: PAPERLESS_TIME_ZONE: {{ .Values.controllers.main.containers.main.env.TZ }}
PAPERLESS_TIME_ZONE: {{ .Values.env.TZ }} PAPERLESS_PORT: {{ quote .Values.service.main.ports.http.port }}
PAPERLESS_PORT: {{ quote .Values.service.main.ports.http.port }}
{{- with .Values.ingress.main }} {{- with .Values.ingress.main }}
{{- if and .enabled .hosts }} {{- if and .enabled .hosts }}
PAPERLESS_URL: http{{ if .tls }}s{{ end }}://{{ (first .hosts).host }} PAPERLESS_URL: http{{ if .tls }}s{{ end }}://{{ (first .hosts).host }}
{{- end }} {{- end }}
{{- end }} {{- end }}
{{- if .Values.postgresql.enabled }} {{- if .Values.postgresql.enabled }}
{{- with .Values.postgresql }} {{- with .Values.postgresql }}
PAPERLESS_DBENGINE: postgresql PAPERLESS_DBENGINE: postgresql
PAPERLESS_DBHOST: {{ $.Release.Name }}-postgresql PAPERLESS_DBHOST: {{ $.Release.Name }}-postgresql
PAPERLESS_DBNAME: {{ .auth.database }} PAPERLESS_DBNAME: {{ .auth.database }}
PAPERLESS_DBUSER: {{ default "postgres" .auth.username }} PAPERLESS_DBUSER: {{ default "postgres" .auth.username }}
PAPERLESS_DBPASS: PAPERLESS_DBPASS:
secretKeyRef: secretKeyRef:
name: {{ .auth.existingSecret | default (printf "%s-postgresql" $.Release.Name) }} name: {{ .auth.existingSecret | default (printf "%s-postgresql" $.Release.Name) }}
key: {{ if not .auth.password }}postgres-{{ end }}password key: {{ if not .auth.password }}postgres-{{ end }}password
{{- end }} {{- end }}
{{- else if .Values.mariadb.enabled }} {{- else if .Values.mariadb.enabled }}
{{- with .Values.mariadb}} {{- with .Values.mariadb}}
PAPERLESS_DBENGINE: mariadb PAPERLESS_DBENGINE: mariadb
PAPERLESS_DBHOST: {{ $.Release.Name }}-mariadb PAPERLESS_DBHOST: {{ $.Release.Name }}-mariadb
PAPERLESS_DBNAME: {{ .auth.database }} PAPERLESS_DBNAME: {{ .auth.database }}
PAPERLESS_DBUSER: {{ .auth.username }} PAPERLESS_DBUSER: {{ .auth.username }}
PAPERLESS_DBPASS: PAPERLESS_DBPASS:
secretKeyRef: secretKeyRef:
name: {{ .auth.existingSecret | default (printf "%s-mariadb" $.Release.Name) }} name: {{ .auth.existingSecret | default (printf "%s-mariadb" $.Release.Name) }}
key: mariadb-password key: mariadb-password
{{- end }} {{- end }}
{{- end }} {{- end }}
{{- if .Values.redis.enabled }} {{- if .Values.redis.enabled }}
{{- with .Values.redis }} {{- with .Values.redis }}
A_REDIS_PASSWORD: A_REDIS_PASSWORD:
secretKeyRef: secretKeyRef:
name: {{ .auth.existingSecret | default (printf "%s-redis" $.Release.Name) }} name: {{ .auth.existingSecret | default (printf "%s-redis" $.Release.Name) }}
key: {{ .auth.existingSecretPasswordKey | default "redis-password" }} key: {{ .auth.existingSecretPasswordKey | default "redis-password" }}
PAPERLESS_REDIS: redis://{{ .auth.username }}:$(A_REDIS_PASSWORD)@{{ $.Release.Name }}-redis-master PAPERLESS_REDIS: redis://{{ .auth.username }}:$(A_REDIS_PASSWORD)@{{ $.Release.Name }}-redis-master
{{- end }} {{- end }}
{{- end }} {{- end }}
{{- end -}} {{- end -}}
{{- $_ := merge .Values (include "healthchecks.harcodedValues" . | fromYaml) -}} {{- /* Mergt die Umgebungsvariablen in den 'env'-Block des Haupt-Containers */ -}}
{{- $_ := mergeOverwrite .Values.controllers.main.containers.main.env (include "healthchecks.harcodedValues" . | fromYaml) -}}
{{/* Render the templates */}} {{/* Render the templates */}}
{{ include "bjw-s.common.loader.all" . }} {{ include "bjw-s.common.loader.all" . }}

View File

@@ -20,11 +20,10 @@ controllers:
# @default -- See [values.yaml](./values.yaml) # @default -- See [values.yaml](./values.yaml)
# -- Set the resource requests / limits for the container. # -- Set the resource requests / limits for the container.
resources: {} resources: {}
env:
env: # -- Set the container timezone
# -- Set the container timezone TZ: UTC
TZ: UTC # PAPERLESS_SECRET_KEY: ""
# PAPERLESS_SECRET_KEY: ""
service: service:
# -- Configures service settings for the chart. # -- Configures service settings for the chart.