Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

immich: use templates to reduce boilerplate #1699

Merged
merged 3 commits into from
Nov 6, 2023
Merged

immich: use templates to reduce boilerplate #1699

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
24f252d
immich: use templates to reduce boilerplate
stavros-k Nov 2, 2023
3bc56ee
bump
stavros-k Nov 2, 2023
aeba7e9
bump common
stavros-k Nov 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions library/ix-dev/community/immich/Chart.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
dependencies:
- name: common
repository: file://../../../common
version: 1.2.0
digest: sha256:a87a6988cedfc3f8a90eb308dffaaeaa1cbd0cad31c20e15b1147084360b9ec1
generated: "2023-10-29T21:49:28.244979676+02:00"
version: 1.2.1
digest: sha256:d695592ea5213fe64453171205ca326015d02df3888a7858becc0c733b0de4c7
generated: "2023-11-02T17:55:14.736911343+02:00"
4 changes: 2 additions & 2 deletions library/ix-dev/community/immich/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ description: Immich
annotations:
title: Immich
type: application
version: 1.0.33
version: 1.0.34
apiVersion: v2
appVersion: 1.84.0
kubeVersion: '>=1.16.0-0'
Expand All @@ -14,7 +14,7 @@ maintainers:
dependencies:
- name: common
repository: file://../../../common
version: 1.2.0
version: 1.2.1
home: https://immich.app
icon: https://media.sys.truenas.net/apps/immich/icons/icon.svg
sources:
Expand Down
Binary file removed library/ix-dev/community/immich/charts/common-1.2.0.tgz
View file
Open in desktop
Binary file not shown.
Binary file added library/ix-dev/community/immich/charts/common-1.2.1.tgz
View file
Open in desktop
Binary file not shown.
34 changes: 4 additions & 30 deletions library/ix-dev/community/immich/templates/_persistence.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,34 +117,8 @@ persistence:
mountPath: /tmp

{{/* Database */}}
postgresdata:
enabled: true
type: {{ .Values.immichStorage.pgData.type }}
datasetName: {{ .Values.immichStorage.pgData.datasetName | default "" }}
hostPath: {{ .Values.immichStorage.pgData.hostPath | default "" }}
targetSelector:
# Postgres pod
postgres:
# Postgres container
postgres:
mountPath: /var/lib/postgresql/data
# Postgres - Permissions container
# Different than the 01-permissions
permissions:
mountPath: /mnt/directories/postgres_data
postgresbackup:
enabled: true
type: {{ .Values.immichStorage.pgBackup.type }}
datasetName: {{ .Values.immichStorage.pgBackup.datasetName | default "" }}
hostPath: {{ .Values.immichStorage.pgBackup.hostPath | default "" }}
targetSelector:
# Postgres backup pod
postgresbackup:
# Postgres backup container
postgresbackup:
mountPath: /postgres_backup
# Postgres - Permissions container
# Different than the 01-permissions
permissions:
mountPath: /mnt/directories/postgres_backup
{{- include "ix.v1.common.app.postgresPersistence"
(dict "pgData" .Values.immichStorage.pgData
"pgBackup" .Values.immichStorage.pgBackup
) | nindent 2 }}
{{- end -}}
13 changes: 2 additions & 11 deletions library/ix-dev/community/immich/templates/_service.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,15 +91,6 @@ service:
targetPort: 6379
targetSelector: redis

postgres:
enabled: true
type: ClusterIP
targetSelector: postgres
ports:
postgres:
enabled: true
primary: true
port: 5432
targetPort: 5432
targetSelector: postgres
{{- include "ix.v1.common.app.postgresService" $ | nindent 2 }}

{{- end -}}
Loading