diff --git a/charts/stable/papermerge/Chart.yaml b/charts/stable/papermerge/Chart.yaml index 8e6cfa0b1f7..0fced6527d0 100644 --- a/charts/stable/papermerge/Chart.yaml +++ b/charts/stable/papermerge/Chart.yaml @@ -6,7 +6,7 @@ annotations: truecharts.org/min_helm_version: "3.11" truecharts.org/train: stable apiVersion: v2 -appVersion: 2.1.9 +appVersion: 3.2.0 dependencies: - name: common version: 24.1.14 @@ -39,4 +39,4 @@ sources: - https://github.com/truecharts/charts/tree/master/charts/stable/papermerge - https://hub.docker.com/r/papermerge/papermerge type: application -version: 14.3.1 +version: 15.0.0 diff --git a/charts/stable/papermerge/templates/_secrets.tpl b/charts/stable/papermerge/templates/_secrets.tpl index fd487f1756a..e872be89471 100644 --- a/charts/stable/papermerge/templates/_secrets.tpl +++ b/charts/stable/papermerge/templates/_secrets.tpl @@ -5,9 +5,9 @@ {{- $pass_key := randAlphaNum 32 -}} {{- with (lookup "v1" "Secret" .Release.Namespace $secretName) -}} - {{- $pass_key = index .data "PAPERMERGE__MAIN__SECRET_KEY" | b64dec -}} + {{- $pass_key = index .data "PAPERMERGE__SECURITY__SECRET_KEY" | b64dec -}} {{- end }} enabled: true data: - PAPERMERGE__MAIN__SECRET_KEY: {{ $pass_key }} + PAPERMERGE__SECURITY__SECRET_KEY: {{ $pass_key }} {{- end -}} diff --git a/charts/stable/papermerge/values.yaml b/charts/stable/papermerge/values.yaml index d18343fedd5..de3be12fa18 100644 --- a/charts/stable/papermerge/values.yaml +++ b/charts/stable/papermerge/values.yaml @@ -1,7 +1,7 @@ image: repository: papermerge/papermerge pullPolicy: IfNotPresent - tag: 2.1.9@sha256:6633dded7eec5310047061da0d2ad60e4f4680223f77d13f691dce171dc244bc + tag: 3.2.0@sha256:11bd6e47622b295ee40f1e719c63235544121839a30e5083d959208931007b62 securityContext: container: runAsNonRoot: false @@ -12,46 +12,33 @@ service: main: ports: main: - targetPort: 8000 - port: 10141 + targetPort: 80 + port: 12000 workload: main: podSpec: containers: main: env: - PAPERMERGE__MAIN__TIMEZONE: "{{ .Values.TZ }}" - DJANGO_SUPERUSER_EMAIL: admin@example.com - DJANGO_SUPERUSER_USENAME: admin - DJANGO_SUPERUSER_PASSWORD: my_admin_password123 - PAPERMERGE__MAIN__SECRET_KEY: + PAPERMERGE__SECURITY__SECRET_KEY: secretKeyRef: name: papermerge-secrets - key: PAPERMERGE__MAIN__SECRET_KEY - PAPERMERGE__DATABASE__TYPE: postgres - PAPERMERGE__DATABASE__NAME: "{{ .Values.cnpg.main.database }}" - PAPERMERGE__DATABASE__USER: "{{ .Values.cnpg.main.user }}" - PAPERMERGE__DATABASE__PORT: 5432 - PAPERMERGE__DATABASE__HOST: - secretKeyRef: - name: cnpg-main-urls - key: host - PAPERMERGE__DATABASE__PASSWORD: - secretKeyRef: - name: cnpg-main-user - key: password - PAPERMERGE__REDIS__PORT: 6379 - PAPERMERGE__REDIS__HOST: + key: PAPERMERGE__SECURITY__SECRET_KEY + PAPERMERGE__AUTH__USERNAME: admin + PAPERMERGE__AUTH__PASSWORD: admin + PAPERMERGE__DATABASE__URL: '{{ printf "postgresql://%s:%s@%s:5432/%s" .Values.cnpg.main.user .Values.cnpg.main.creds.password .Values.cnpg.main.creds.host .Values.cnpg.main.database }}' + PAPERMERGE__REDIS__URL: secretKeyRef: expandObjectName: false name: '{{ printf "%s-%s" .Release.Name "rediscreds" }}' - key: plainhost + key: url persistence: config: enabled: true - mountPath: "/config" - varrun: + mountPath: "/core_app/index_db" + media: enabled: true + mountPath: "/core_app/media" redis: enabled: true redisUsername: papermerge