catalin/fukuops
1
0
Fork 1
Code Issues 10 Pull requests Projects 2 Releases Packages 10 Activity

feat: revamp immich's values hierarchy

Browse source
This commit is contained in:
cătălin 2026-08-09 10:10:52 +02:00
commit 5203fd2af0
No known key found for this signature in database
12 changed files with 352 additions and 288 deletions
Download patch file Download diff file Expand all files Collapse all files

1
docker/pluton/docker-compose.yml
View file

@ -9,6 +9,7 @@ services:
volumes: volumes:
- ${PLUTON_DATA:-/mnt/nas1/shared/pluton/data}:/data - ${PLUTON_DATA:-/mnt/nas1/shared/pluton/data}:/data
- ${PLUTON_BACKUP_VOLUME_SHARED:-/mnt/nas1/shared}:/backups/shared - ${PLUTON_BACKUP_VOLUME_SHARED:-/mnt/nas1/shared}:/backups/shared
- ${PLUTON_BACKUP_VOLUME_DCSI:-/mnt/nas1/dcsi}:/backups/dcsi
environment: environment:
ENCRYPTION_KEY: ${ENCRYPTION_KEY} ENCRYPTION_KEY: ${ENCRYPTION_KEY}
USER_NAME: ${USER_NAME} USER_NAME: ${USER_NAME}

156
k8s/argo-apps/immich.yaml
View file

@ -12,84 +12,90 @@ spec:
sources: sources:
- repoURL: git.roboces.dev/catalin/fukuops - repoURL: git.roboces.dev/catalin/fukuops
chart: immich chart: immich
targetRevision: 0.2.1 targetRevision: 0.2.3
helm: helm:
valuesObject: valuesObject:
replicaCount: 1 machine-learning:
securityContext:
allowPrivilegeEscalation: false
readOnlyRootFilesystem: false
runAsUser: 10000
runAsGroup: 10000
capabilities:
drop:
- all
service:
type: LoadBalancer
db:
hostname: "192.168.1.3"
port: 5432
database_name: "immich"
redis:
hostname: "192.168.1.3"
port: 30036
dbindex: "12"
general:
tz: "Europe/Madrid"
persistence:
library:
enabled: true
storageClass: "truenas-nfs-csi"
accessMode: ReadWriteMany
size: 500Gi
encodedVideo:
enabled: true
storageClass: "truenas-nfs-csi"
accessMode: ReadWriteMany
size: 10Gi
thumbs:
enabled: true
storageClass: "truenas-nfs-csi"
accessMode: ReadWriteMany
size: 10Gi
upload:
enabled: true
storageClass: "truenas-nfs-csi"
accessMode: ReadWriteMany
size: 10Gi
profile:
enabled: true
storageClass: "truenas-nfs-csi"
accessMode: ReadWriteMany
size: 1Gi
backups:
enabled: true
storageClass: "truenas-nfs-csi"
accessMode: ReadWriteMany
size: 10Gi
modelCache:
enabled: true
storageClass: "truenas-nfs-csi"
accessMode: ReadWriteMany
size: 10Gi
resources:
requests:
cpu: 500m
memory: 1Gi
limits:
cpu: 1
memory: 2Gi
ingress:
enabled: true enabled: true
annotations: service:
traefik.ingress.kubernetes.io/router.entrypoints: websecure type: LoadBalancer
traefik.ingress.kubernetes.io/router.tls: "true" immich:
hosts: autoscaling:
- host: photos.roboces.dev enabled: true
paths: securityContext:
- path: / allowPrivilegeEscalation: false
pathType: Prefix readOnlyRootFilesystem: false
tls: [] runAsUser: 10000
runAsGroup: 10000
capabilities:
drop:
- all
service:
type: LoadBalancer
db:
hostname: "192.168.1.3"
port: 5432
database_name: "immich"
redis:
hostname: "192.168.1.3"
port: 30036
dbindex: "12"
general:
tz: "Europe/Madrid"
persistence:
library:
enabled: true
storageClass: "truenas-nfs-csi"
accessMode: ReadWriteMany
size: 500Gi
encodedVideo:
enabled: true
storageClass: "truenas-nfs-csi"
accessMode: ReadWriteMany
size: 10Gi
thumbs:
enabled: true
storageClass: "truenas-nfs-csi"
accessMode: ReadWriteMany
size: 10Gi
upload:
enabled: true
storageClass: "truenas-nfs-csi"
accessMode: ReadWriteMany
size: 10Gi
profile:
enabled: true
storageClass: "truenas-nfs-csi"
accessMode: ReadWriteMany
size: 1Gi
backups:
enabled: true
storageClass: "truenas-nfs-csi"
accessMode: ReadWriteMany
size: 10Gi
modelCache:
enabled: true
storageClass: "truenas-nfs-csi"
accessMode: ReadWriteMany
size: 10Gi
resources:
requests:
cpu: 500m
memory: 1Gi
limits:
cpu: 1
memory: 2Gi
ingress:
enabled: true
annotations:
traefik.ingress.kubernetes.io/router.entrypoints: websecure
traefik.ingress.kubernetes.io/router.tls: "true"
hosts:
- host: photos.roboces.dev
paths:
- path: /
pathType: Prefix
tls: []
secret: secret:
existingSecretName: "immich-secrets" existingSecretName: "immich-secrets"
project: roboces project: roboces

2
k8s/charts/immich/Chart.yaml
View file

@ -2,7 +2,7 @@ apiVersion: v2
name: immich name: immich
description: A Helm chart for Immich photo and video backup solution description: A Helm chart for Immich photo and video backup solution
type: application type: application
version: 0.1.0 version: 0.2.3
appVersion: v3.1.0 appVersion: v3.1.0
keywords: keywords:
- immich - immich

8
k8s/charts/immich/templates/configmap.yaml
View file

@ -5,16 +5,16 @@ metadata:
labels: labels:
{{- include "immich.labels" . | nindent 4 }} {{- include "immich.labels" . | nindent 4 }}
data: data:
TZ: {{ .Values.general.tz | quote }} TZ: {{ .Values.immich.general.tz | quote }}
IMMICH_PORT: {{ .Values.service.port | quote }} IMMICH_PORT: {{ .Values.immich.service.port | quote }}
IMMICH_MACHINE_LEARNING_URL: {{ printf "http://%s-machine-learning:3003" (include "immich.fullname" .) | quote }} IMMICH_MACHINE_LEARNING_URL: {{ printf "http://%s-machine-learning:3003" (include "immich.fullname" .) | quote }}
{{- range $key, $value := .Values.db }} {{- range $key, $value := .Values.immich.db }}
{{- if and (ne $key "password") $value }} {{- if and (ne $key "password") $value }}
{{ $keyName := printf "DB_%s" (upper $key) }} {{ $keyName := printf "DB_%s" (upper $key) }}
{{ $keyName }}: {{ $value | quote }} {{ $keyName }}: {{ $value | quote }}
{{- end }} {{- end }}
{{- end }} {{- end }}
{{- range $key, $value := .Values.redis }} {{- range $key, $value := .Values.immich.redis }}
{{- if and (ne $key "password") (ne $key "username") $value }} {{- if and (ne $key "password") (ne $key "username") $value }}
{{ $keyName := printf "REDIS_%s" (upper $key) }} {{ $keyName := printf "REDIS_%s" (upper $key) }}
{{ $keyName }}: {{ $value | quote }} {{ $keyName }}: {{ $value | quote }}

56
k8s/charts/immich/templates/deployment.yaml
View file

@ -6,8 +6,8 @@ metadata:
{{- include "immich.labels" . | nindent 4 }} {{- include "immich.labels" . | nindent 4 }}
app.kubernetes.io/component: server app.kubernetes.io/component: server
spec: spec:
{{- if not .Values.autoscaling.enabled }} {{- if not .Values.immich.autoscaling.enabled }}
replicas: {{ .Values.replicaCount }} replicas: {{ .Values.immich.replicaCount }}
{{- end }} {{- end }}
selector: selector:
matchLabels: matchLabels:
@ -20,7 +20,7 @@ spec:
type: RollingUpdate type: RollingUpdate
template: template:
metadata: metadata:
{{- with .Values.podAnnotations }} {{- with .Values.immich.podAnnotations }}
annotations: annotations:
{{- toYaml . | nindent 8 }} {{- toYaml . | nindent 8 }}
{{- end }} {{- end }}
@ -28,15 +28,15 @@ spec:
{{- include "immich.selectorLabels" . | nindent 8 }} {{- include "immich.selectorLabels" . | nindent 8 }}
app.kubernetes.io/component: server app.kubernetes.io/component: server
spec: spec:
{{- with .Values.imagePullSecrets }} {{- with .Values.immich.imagePullSecrets }}
imagePullSecrets: imagePullSecrets:
{{- toYaml . | nindent 8 }} {{- toYaml . | nindent 8 }}
{{- end }} {{- end }}
securityContext: securityContext:
{{- toYaml .Values.podSecurityContext | nindent 8 }} {{- toYaml .Values.immich.podSecurityContext | nindent 8 }}
initContainers: initContainers:
- name: init-immich - name: init-immich
image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" image: "{{ .Values.immich.image.repository }}:{{ .Values.immich.image.tag | default .Chart.AppVersion }}"
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
command: command:
- sh - sh
@ -65,9 +65,9 @@ spec:
containers: containers:
- name: {{ .Chart.Name }}-server - name: {{ .Chart.Name }}-server
securityContext: securityContext:
{{- toYaml .Values.securityContext | nindent 12 }} {{- toYaml .Values.immich.securityContext | nindent 12 }}
image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" image: "{{ .Values.immich.image.repository }}:{{ .Values.immich.image.tag | default .Chart.AppVersion }}"
imagePullPolicy: {{ .Values.image.pullPolicy }} imagePullPolicy: {{ .Values.immich.image.pullPolicy }}
envFrom: envFrom:
{{- if .Values.secret.existingSecretName }} {{- if .Values.secret.existingSecretName }}
- secretRef: - secretRef:
@ -80,10 +80,10 @@ spec:
name: {{ include "immich.fullname" . }} name: {{ include "immich.fullname" . }}
env: env:
- name: IMMICH_PORT - name: IMMICH_PORT
value: {{ .Values.service.port | quote }} value: {{ .Values.immich.service.port | quote }}
- name: IMMICH_MACHINE_LEARNING_URL - name: IMMICH_MACHINE_LEARNING_URL
value: {{ printf "http://%s-machine-learning:3003" (include "immich.fullname" .) | quote }} value: {{ printf "http://%s-machine-learning:3003" (include "immich.fullname" .) | quote }}
{{- range $key, $value := .Values.env }} {{- range $key, $value := .Values.immich.env }}
- name: {{ $key }} - name: {{ $key }}
value: {{ $value | quote }} value: {{ $value | quote }}
{{- end }} {{- end }}
@ -92,75 +92,75 @@ spec:
containerPort: 2283 containerPort: 2283
protocol: TCP protocol: TCP
livenessProbe: livenessProbe:
{{- toYaml .Values.livenessProbe | nindent 12 }} {{- toYaml .Values.immich.livenessProbe | nindent 12 }}
readinessProbe: readinessProbe:
{{- toYaml .Values.readinessProbe | nindent 12 }} {{- toYaml .Values.immich.readinessProbe | nindent 12 }}
resources: resources:
{{- toYaml .Values.resources | nindent 12 }} {{- toYaml .Values.immich.resources | nindent 12 }}
volumeMounts: volumeMounts:
- name: library - name: library
mountPath: /data/library mountPath: /data/library
{{- if .Values.persistence.encodedVideo.enabled }} {{- if .Values.immich.persistence.encodedVideo.enabled }}
- name: encoded-video - name: encoded-video
mountPath: /data/encoded-video mountPath: /data/encoded-video
{{- end }} {{- end }}
{{- if .Values.persistence.thumbs.enabled }} {{- if .Values.immich.persistence.thumbs.enabled }}
- name: thumbs - name: thumbs
mountPath: /data/thumbs mountPath: /data/thumbs
{{- end }} {{- end }}
{{- if .Values.persistence.upload.enabled }} {{- if .Values.immich.persistence.upload.enabled }}
- name: upload - name: upload
mountPath: /data/upload mountPath: /data/upload
{{- end }} {{- end }}
{{- if .Values.persistence.profile.enabled }} {{- if .Values.immich.persistence.profile.enabled }}
- name: profile - name: profile
mountPath: /data/profile mountPath: /data/profile
{{- end }} {{- end }}
{{- if .Values.persistence.backups.enabled }} {{- if .Values.immich.persistence.backups.enabled }}
- name: backups - name: backups
mountPath: /data/backups mountPath: /data/backups
{{- end }} {{- end }}
{{- with .Values.nodeSelector }} {{- with .Values.immich.nodeSelector }}
nodeSelector: nodeSelector:
{{- toYaml . | nindent 8 }} {{- toYaml . | nindent 8 }}
{{- end }} {{- end }}
{{- with .Values.affinity }} {{- with .Values.immich.affinity }}
affinity: affinity:
{{- toYaml . | nindent 8 }} {{- toYaml . | nindent 8 }}
{{- end }} {{- end }}
{{- with .Values.tolerations }} {{- with .Values.immich.tolerations }}
tolerations: tolerations:
{{- toYaml . | nindent 8 }} {{- toYaml . | nindent 8 }}
{{- end }} {{- end }}
restartPolicy: Always restartPolicy: Always
automountServiceAccountToken: false automountServiceAccountToken: false
volumes: volumes:
{{- if .Values.persistence.library.enabled }} {{- if .Values.immich.persistence.library.enabled }}
- name: library - name: library
persistentVolumeClaim: persistentVolumeClaim:
claimName: {{ include "immich.fullname" . }}-library claimName: {{ include "immich.fullname" . }}-library
{{- end }} {{- end }}
{{- if .Values.persistence.encodedVideo.enabled }} {{- if .Values.immich.persistence.encodedVideo.enabled }}
- name: encoded-video - name: encoded-video
persistentVolumeClaim: persistentVolumeClaim:
claimName: {{ include "immich.fullname" . }}-encoded-video claimName: {{ include "immich.fullname" . }}-encoded-video
{{- end }} {{- end }}
{{- if .Values.persistence.thumbs.enabled }} {{- if .Values.immich.persistence.thumbs.enabled }}
- name: thumbs - name: thumbs
persistentVolumeClaim: persistentVolumeClaim:
claimName: {{ include "immich.fullname" . }}-thumbs claimName: {{ include "immich.fullname" . }}-thumbs
{{- end }} {{- end }}
{{- if .Values.persistence.upload.enabled }} {{- if .Values.immich.persistence.upload.enabled }}
- name: upload - name: upload
persistentVolumeClaim: persistentVolumeClaim:
claimName: {{ include "immich.fullname" . }}-upload claimName: {{ include "immich.fullname" . }}-upload
{{- end }} {{- end }}
{{- if .Values.persistence.profile.enabled }} {{- if .Values.immich.persistence.profile.enabled }}
- name: profile - name: profile
persistentVolumeClaim: persistentVolumeClaim:
claimName: {{ include "immich.fullname" . }}-profile claimName: {{ include "immich.fullname" . }}-profile
{{- end }} {{- end }}
{{- if .Values.persistence.backups.enabled }} {{- if .Values.immich.persistence.backups.enabled }}
- name: backups - name: backups
persistentVolumeClaim: persistentVolumeClaim:
claimName: {{ include "immich.fullname" . }}-backups claimName: {{ include "immich.fullname" . }}-backups

14
k8s/charts/immich/templates/hpa.yaml
View file

@ -1,4 +1,4 @@
{{- if .Values.autoscaling.enabled }} {{- if .Values.immich.autoscaling.enabled }}
--- ---
apiVersion: autoscaling/v2 apiVersion: autoscaling/v2
kind: HorizontalPodAutoscaler kind: HorizontalPodAutoscaler
@ -12,23 +12,23 @@ spec:
apiVersion: apps/v1 apiVersion: apps/v1
kind: Deployment kind: Deployment
name: {{ include "immich.fullname" . }}-server name: {{ include "immich.fullname" . }}-server
minReplicas: {{ .Values.autoscaling.minReplicas }} minReplicas: {{ .Values.immich.autoscaling.minReplicas }}
maxReplicas: {{ .Values.autoscaling.maxReplicas }} maxReplicas: {{ .Values.immich.autoscaling.maxReplicas }}
metrics: metrics:
{{- if .Values.autoscaling.targetCPUUtilizationPercentage }} {{- if .Values.immich.autoscaling.targetCPUUtilizationPercentage }}
- type: Resource - type: Resource
resource: resource:
name: cpu name: cpu
target: target:
type: Utilization type: Utilization
averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} averageUtilization: {{ .Values.immich.autoscaling.targetCPUUtilizationPercentage }}
{{- end }} {{- end }}
{{- if .Values.autoscaling.targetMemoryUtilizationPercentage }} {{- if .Values.immich.autoscaling.targetMemoryUtilizationPercentage }}
- type: Resource - type: Resource
resource: resource:
name: memory name: memory
target: target:
type: Utilization type: Utilization
averageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} averageUtilization: {{ .Values.immich.autoscaling.targetMemoryUtilizationPercentage }}
{{- end }} {{- end }}
{{- end }} {{- end }}

16
k8s/charts/immich/templates/ingress.yaml
View file

@ -1,23 +1,23 @@
{{- if .Values.ingress.enabled -}} {{- if .Values.immich.ingress.enabled -}}
{{- $fullName := include "immich.fullname" . -}} {{- $fullName := include "immich.fullname" . -}}
{{- $svcPort := .Values.service.port -}} {{- $svcPort := .Values.immich.service.port -}}
apiVersion: networking.k8s.io/v1 apiVersion: networking.k8s.io/v1
kind: Ingress kind: Ingress
metadata: metadata:
name: {{ $fullName }} name: {{ $fullName }}
labels: labels:
{{- include "immich.labels" . | nindent 4 }} {{- include "immich.labels" . | nindent 4 }}
{{- with .Values.ingress.annotations }} {{- with .Values.immich.ingress.annotations }}
annotations: annotations:
{{- toYaml . | nindent 4 }} {{- toYaml . | nindent 4 }}
{{- end }} {{- end }}
spec: spec:
{{- if .Values.ingress.className }} {{- if .Values.immich.ingress.className }}
ingressClassName: {{ .Values.ingress.className }} ingressClassName: {{ .Values.immich.ingress.className }}
{{- end }} {{- end }}
{{- if .Values.ingress.tls }} {{- if .Values.immich.ingress.tls }}
tls: tls:
{{- range .Values.ingress.tls }} {{- range .Values.immich.ingress.tls }}
- hosts: - hosts:
{{- range .hosts }} {{- range .hosts }}
- {{ . | quote }} - {{ . | quote }}
@ -26,7 +26,7 @@ spec:
{{- end }} {{- end }}
{{- end }} {{- end }}
rules: rules:
{{- range .Values.ingress.hosts }} {{- range .Values.immich.ingress.hosts }}
- host: {{ .host | quote }} - host: {{ .host | quote }}
http: http:
paths: paths:

70
k8s/charts/immich/templates/pvc.yaml
View file

@ -1,4 +1,4 @@
{{- if .Values.persistence.library.enabled }} {{- if .Values.immich.persistence.library.enabled }}
--- ---
apiVersion: v1 apiVersion: v1
kind: PersistentVolumeClaim kind: PersistentVolumeClaim
@ -8,15 +8,15 @@ metadata:
{{- include "immich.labels" . | nindent 4 }} {{- include "immich.labels" . | nindent 4 }}
spec: spec:
accessModes: accessModes:
- {{ .Values.persistence.library.accessMode }} - {{ .Values.immich.persistence.library.accessMode }}
{{- if .Values.persistence.library.storageClass }} {{- if .Values.immich.persistence.library.storageClass }}
storageClassName: {{ .Values.persistence.library.storageClass | quote }} storageClassName: {{ .Values.immich.persistence.library.storageClass | quote }}
{{- end }} {{- end }}
resources: resources:
requests: requests:
storage: {{ .Values.persistence.library.size }} storage: {{ .Values.immich.persistence.library.size }}
{{- end }} {{- end }}
{{- if .Values.persistence.encodedVideo.enabled }} {{- if .Values.immich.persistence.encodedVideo.enabled }}
--- ---
apiVersion: v1 apiVersion: v1
kind: PersistentVolumeClaim kind: PersistentVolumeClaim
@ -26,15 +26,15 @@ metadata:
{{- include "immich.labels" . | nindent 4 }} {{- include "immich.labels" . | nindent 4 }}
spec: spec:
accessModes: accessModes:
- {{ .Values.persistence.encodedVideo.accessMode }} - {{ .Values.immich.persistence.encodedVideo.accessMode }}
{{- if .Values.persistence.encodedVideo.storageClass }} {{- if .Values.immich.persistence.encodedVideo.storageClass }}
storageClassName: {{ .Values.persistence.encodedVideo.storageClass | quote }} storageClassName: {{ .Values.immich.persistence.encodedVideo.storageClass | quote }}
{{- end }} {{- end }}
resources: resources:
requests: requests:
storage: {{ .Values.persistence.encodedVideo.size }} storage: {{ .Values.immich.persistence.encodedVideo.size }}
{{- end }} {{- end }}
{{- if .Values.persistence.thumbs.enabled }} {{- if .Values.immich.persistence.thumbs.enabled }}
--- ---
apiVersion: v1 apiVersion: v1
kind: PersistentVolumeClaim kind: PersistentVolumeClaim
@ -44,15 +44,15 @@ metadata:
{{- include "immich.labels" . | nindent 4 }} {{- include "immich.labels" . | nindent 4 }}
spec: spec:
accessModes: accessModes:
- {{ .Values.persistence.thumbs.accessMode }} - {{ .Values.immich.persistence.thumbs.accessMode }}
{{- if .Values.persistence.thumbs.storageClass }} {{- if .Values.immich.persistence.thumbs.storageClass }}
storageClassName: {{ .Values.persistence.thumbs.storageClass | quote }} storageClassName: {{ .Values.immich.persistence.thumbs.storageClass | quote }}
{{- end }} {{- end }}
resources: resources:
requests: requests:
storage: {{ .Values.persistence.thumbs.size }} storage: {{ .Values.immich.persistence.thumbs.size }}
{{- end }} {{- end }}
{{- if .Values.persistence.upload.enabled }} {{- if .Values.immich.persistence.upload.enabled }}
--- ---
apiVersion: v1 apiVersion: v1
kind: PersistentVolumeClaim kind: PersistentVolumeClaim
@ -62,15 +62,15 @@ metadata:
{{- include "immich.labels" . | nindent 4 }} {{- include "immich.labels" . | nindent 4 }}
spec: spec:
accessModes: accessModes:
- {{ .Values.persistence.upload.accessMode }} - {{ .Values.immich.persistence.upload.accessMode }}
{{- if .Values.persistence.upload.storageClass }} {{- if .Values.immich.persistence.upload.storageClass }}
storageClassName: {{ .Values.persistence.upload.storageClass | quote }} storageClassName: {{ .Values.immich.persistence.upload.storageClass | quote }}
{{- end }} {{- end }}
resources: resources:
requests: requests:
storage: {{ .Values.persistence.upload.size }} storage: {{ .Values.immich.persistence.upload.size }}
{{- end }} {{- end }}
{{- if .Values.persistence.profile.enabled }} {{- if .Values.immich.persistence.profile.enabled }}
--- ---
apiVersion: v1 apiVersion: v1
kind: PersistentVolumeClaim kind: PersistentVolumeClaim
@ -80,15 +80,15 @@ metadata:
{{- include "immich.labels" . | nindent 4 }} {{- include "immich.labels" . | nindent 4 }}
spec: spec:
accessModes: accessModes:
- {{ .Values.persistence.profile.accessMode }} - {{ .Values.immich.persistence.profile.accessMode }}
{{- if .Values.persistence.profile.storageClass }} {{- if .Values.immich.persistence.profile.storageClass }}
storageClassName: {{ .Values.persistence.profile.storageClass | quote }} storageClassName: {{ .Values.immich.persistence.profile.storageClass | quote }}
{{- end }} {{- end }}
resources: resources:
requests: requests:
storage: {{ .Values.persistence.profile.size }} storage: {{ .Values.immich.persistence.profile.size }}
{{- end }} {{- end }}
{{- if .Values.persistence.backups.enabled }} {{- if .Values.immich.persistence.backups.enabled }}
--- ---
apiVersion: v1 apiVersion: v1
kind: PersistentVolumeClaim kind: PersistentVolumeClaim
@ -98,15 +98,15 @@ metadata:
{{- include "immich.labels" . | nindent 4 }} {{- include "immich.labels" . | nindent 4 }}
spec: spec:
accessModes: accessModes:
- {{ .Values.persistence.backups.accessMode }} - {{ .Values.immich.persistence.backups.accessMode }}
{{- if .Values.persistence.backups.storageClass }} {{- if .Values.immich.persistence.backups.storageClass }}
storageClassName: {{ .Values.persistence.backups.storageClass | quote }} storageClassName: {{ .Values.immich.persistence.backups.storageClass | quote }}
{{- end }} {{- end }}
resources: resources:
requests: requests:
storage: {{ .Values.persistence.backups.size }} storage: {{ .Values.immich.persistence.backups.size }}
{{- end }} {{- end }}
{{- if .Values.persistence.modelCache.enabled }} {{- if and .Values.machineLearning.enabled .Values.machineLearning.persistence.modelCache.enabled }}
--- ---
apiVersion: v1 apiVersion: v1
kind: PersistentVolumeClaim kind: PersistentVolumeClaim
@ -116,11 +116,11 @@ metadata:
{{- include "immich.labels" . | nindent 4 }} {{- include "immich.labels" . | nindent 4 }}
spec: spec:
accessModes: accessModes:
- {{ .Values.persistence.modelCache.accessMode }} - {{ .Values.machineLearning.persistence.modelCache.accessMode }}
{{- if .Values.persistence.modelCache.storageClass }} {{- if .Values.machineLearning.persistence.modelCache.storageClass }}
storageClassName: {{ .Values.persistence.modelCache.storageClass | quote }} storageClassName: {{ .Values.machineLearning.persistence.modelCache.storageClass | quote }}
{{- end }} {{- end }}
resources: resources:
requests: requests:
storage: {{ .Values.persistence.modelCache.size }} storage: {{ .Values.machineLearning.persistence.modelCache.size }}
{{- end }} {{- end }}

16
k8s/charts/immich/templates/secret.yaml
View file

@ -7,17 +7,17 @@ metadata:
{{- include "immich.labels" . | nindent 4 }} {{- include "immich.labels" . | nindent 4 }}
type: Opaque type: Opaque
stringData: stringData:
{{- if .Values.db.password }} {{- if .Values.immich.db.password }}
DB_PASSWORD: {{ .Values.db.password | quote }} DB_PASSWORD: {{ .Values.immich.db.password | quote }}
{{- end }} {{- end }}
{{- if .Values.db.username }} {{- if .Values.immich.db.username }}
DB_USERNAME: {{ .Values.db.username | quote }} DB_USERNAME: {{ .Values.immich.db.username | quote }}
{{- end }} {{- end }}
{{- if .Values.redis.password }} {{- if .Values.immich.redis.password }}
REDIS_PASSWORD: {{ .Values.redis.password | quote }} REDIS_PASSWORD: {{ .Values.immich.redis.password | quote }}
{{- end }} {{- end }}
{{- if .Values.redis.username }} {{- if .Values.immich.redis.username }}
REDIS_USERNAME: {{ .Values.redis.username | quote }} REDIS_USERNAME: {{ .Values.immich.redis.username | quote }}
{{- end }} {{- end }}
{{- range $key, $value := .Values.secret.data }} {{- range $key, $value := .Values.secret.data }}
{{ $key }}: {{ $value | quote }} {{ $key }}: {{ $value | quote }}

10
k8s/charts/immich/templates/service.yaml
View file

@ -5,9 +5,9 @@ metadata:
labels: labels:
{{- include "immich.labels" . | nindent 4 }} {{- include "immich.labels" . | nindent 4 }}
spec: spec:
type: {{ .Values.service.type }} type: {{ .Values.immich.service.type }}
ports: ports:
- port: {{ .Values.service.port }} - port: {{ .Values.immich.service.port }}
targetPort: http targetPort: http
protocol: TCP protocol: TCP
name: http name: http
@ -15,6 +15,7 @@ spec:
{{- include "immich.selectorLabels" . | nindent 4 }} {{- include "immich.selectorLabels" . | nindent 4 }}
app.kubernetes.io/component: server app.kubernetes.io/component: server
--- ---
{{- if .Values.machineLearning.enabled }}
apiVersion: v1 apiVersion: v1
kind: Service kind: Service
metadata: metadata:
@ -23,12 +24,13 @@ metadata:
{{- include "immich.labels" . | nindent 4 }} {{- include "immich.labels" . | nindent 4 }}
app.kubernetes.io/component: machine-learning app.kubernetes.io/component: machine-learning
spec: spec:
type: ClusterIP type: {{ .Values.machineLearning.service.type }}
ports: ports:
- port: 3003 - port: {{ .Values.machineLearning.service.port }}
targetPort: http targetPort: http
protocol: TCP protocol: TCP
name: http name: http
selector: selector:
{{- include "immich.selectorLabels" . | nindent 4 }} {{- include "immich.selectorLabels" . | nindent 4 }}
app.kubernetes.io/component: machine-learning app.kubernetes.io/component: machine-learning
{{- end }}

28
k8s/charts/immich/templates/statefulset.yaml
View file

@ -1,3 +1,4 @@
{{- if .Values.machineLearning.enabled -}}
apiVersion: apps/v1 apiVersion: apps/v1
kind: StatefulSet kind: StatefulSet
metadata: metadata:
@ -7,8 +8,8 @@ metadata:
app.kubernetes.io/component: machine-learning app.kubernetes.io/component: machine-learning
spec: spec:
serviceName: {{ include "immich.fullname" . }}-machine-learning-headless serviceName: {{ include "immich.fullname" . }}-machine-learning-headless
{{- if not .Values.autoscaling.enabled }} {{- if not .Values.machineLearning.autoscaling.enabled }}
replicas: {{ .Values.replicaCount }} replicas: {{ .Values.machineLearning.replicaCount }}
{{- end }} {{- end }}
selector: selector:
matchLabels: matchLabels:
@ -16,7 +17,7 @@ spec:
app.kubernetes.io/component: machine-learning app.kubernetes.io/component: machine-learning
template: template:
metadata: metadata:
{{- with .Values.podAnnotations }} {{- with .Values.machineLearning.podAnnotations }}
annotations: annotations:
{{- toYaml . | nindent 8 }} {{- toYaml . | nindent 8 }}
{{- end }} {{- end }}
@ -24,41 +25,41 @@ spec:
{{- include "immich.selectorLabels" . | nindent 8 }} {{- include "immich.selectorLabels" . | nindent 8 }}
app.kubernetes.io/component: machine-learning app.kubernetes.io/component: machine-learning
spec: spec:
{{- with .Values.imagePullSecrets }} {{- with .Values.machineLearning.imagePullSecrets }}
imagePullSecrets: imagePullSecrets:
{{- toYaml . | nindent 8 }} {{- toYaml . | nindent 8 }}
{{- end }} {{- end }}
securityContext: securityContext:
{{- toYaml .Values.podSecurityContext | nindent 8 }} {{- toYaml .Values.machineLearning.podSecurityContext | nindent 8 }}
containers: containers:
- name: {{ .Chart.Name }}-machine-learning - name: {{ .Chart.Name }}-machine-learning
securityContext: securityContext:
{{- toYaml .Values.securityContext | nindent 12 }} {{- toYaml .Values.machineLearning.securityContext | nindent 12 }}
image: "{{ .Values.machineLearningImage.repository }}:{{ .Values.machineLearningImage.tag | default .Chart.AppVersion }}" image: "{{ .Values.machineLearning.image.repository }}:{{ .Values.machineLearning.image.tag | default .Chart.AppVersion }}"
imagePullPolicy: {{ .Values.machineLearningImage.pullPolicy }} imagePullPolicy: {{ .Values.machineLearning.image.pullPolicy }}
ports: ports:
- name: http - name: http
containerPort: 3003 containerPort: 3003
protocol: TCP protocol: TCP
env: env:
- name: IMMICH_PORT - name: IMMICH_PORT
value: {{ .Values.service.port | quote }} value: {{ .Values.machineLearning.service.port | quote }}
- name: IMMICH_MACHINE_LEARNING_PORT - name: IMMICH_MACHINE_LEARNING_PORT
value: "3003" value: "3003"
resources: resources:
{{- toYaml .Values.resources | nindent 12 }} {{- toYaml .Values.machineLearning.resources | nindent 12 }}
volumeMounts: volumeMounts:
- name: model-cache - name: model-cache
mountPath: /cache mountPath: /cache
{{- with .Values.nodeSelector }} {{- with .Values.machineLearning.nodeSelector }}
nodeSelector: nodeSelector:
{{- toYaml . | nindent 8 }} {{- toYaml . | nindent 8 }}
{{- end }} {{- end }}
{{- with .Values.affinity }} {{- with .Values.machineLearning.affinity }}
affinity: affinity:
{{- toYaml . | nindent 8 }} {{- toYaml . | nindent 8 }}
{{- end }} {{- end }}
{{- with .Values.tolerations }} {{- with .Values.machineLearning.tolerations }}
tolerations: tolerations:
{{- toYaml . | nindent 8 }} {{- toYaml . | nindent 8 }}
{{- end }} {{- end }}
@ -68,3 +69,4 @@ spec:
- name: model-cache - name: model-cache
persistentVolumeClaim: persistentVolumeClaim:
claimName: {{ include "immich.fullname" . }}-model-cache claimName: {{ include "immich.fullname" . }}-model-cache
{{- end }}

243
k8s/charts/immich/values.yaml
View file

@ -1,114 +1,167 @@
replicaCount: 1 immich:
replicaCount: 1
image: image:
repository: ghcr.io/immich-app/immich-server repository: ghcr.io/immich-app/immich-server
pullPolicy: Always pullPolicy: Always
tag: "" tag: ""
machineLearningImage: imagePullSecrets: []
repository: ghcr.io/immich-app/immich-machine-learning podAnnotations: {}
pullPolicy: Always podSecurityContext: {}
tag: "" securityContext: {}
imagePullSecrets: [] service:
podAnnotations: {} type: ClusterIP
podSecurityContext: {} port: 2283
securityContext: {} targetPort: 2283
service: ingress:
type: ClusterIP enabled: false
port: 2283
targetPort: 2283
ingress: db:
hostname: "192.168.1.3"
port: 55432
username: ""
password: ""
database_name: ""
redis:
hostname: "192.168.1.3"
port: 300036
username: ""
password: ""
dbindex: ""
general:
tz: "Europe/Madrid"
persistence:
library:
enabled: true
storageClass: "truenas-nfs-csi"
accessMode: ReadWriteMany
size: 10Gi
encodedVideo:
enabled: true
storageClass: ""
accessMode: ReadWriteMany
size: 10Gi
thumbs:
enabled: true
storageClass: ""
accessMode: ReadWriteMany
size: 10Gi
upload:
enabled: true
storageClass: ""
accessMode: ReadWriteMany
size: 10Gi
profile:
enabled: true
storageClass: ""
accessMode: ReadWriteMany
size: 1Gi
backups:
enabled: true
storageClass: ""
accessMode: ReadWriteMany
size: 10Gi
modelCache:
enabled: true
storageClass: ""
accessMode: ReadWriteMany
size: 10Gi
autoscaling:
enabled: false
minReplicas: 1
maxReplicas: 3
targetCPUUtilizationPercentage: 80
targetMemoryUtilizationPercentage: 80
resources: {}
livenessProbe:
tcpSocket:
port: 2283
initialDelaySeconds: 30
timeoutSeconds: 15
successThreshold: 1
failureThreshold: 3
periodSeconds: 10
readinessProbe:
tcpSocket:
port: 2283
initialDelaySeconds: 15
timeoutSeconds: 2
successThreshold: 1
failureThreshold: 3
periodSeconds: 10
nodeSelector: {}
tolerations: []
affinity: {}
env: {}
machineLearning:
enabled: false enabled: false
db: image:
hostname: "192.168.1.3" repository: ghcr.io/immich-app/immich-machine-learning
port: 55432 pullPolicy: Always
username: "" tag: ""
password: ""
database_name: ""
redis: imagePullSecrets: []
hostname: "192.168.1.3" podAnnotations: {}
port: 300036 podSecurityContext: {}
username: "" securityContext: {}
password: ""
dbindex: ""
general: service:
tz: "Europe/Madrid" type: ClusterIP
port: 3003
persistence: replicaCount: 1
library:
enabled: true
storageClass: "truenas-nfs-csi"
accessMode: ReadWriteMany
size: 10Gi
encodedVideo:
enabled: true
storageClass: ""
accessMode: ReadWriteMany
size: 10Gi
thumbs:
enabled: true
storageClass: ""
accessMode: ReadWriteMany
size: 10Gi
upload:
enabled: true
storageClass: ""
accessMode: ReadWriteMany
size: 10Gi
profile:
enabled: true
storageClass: ""
accessMode: ReadWriteMany
size: 1Gi
backups:
enabled: true
storageClass: ""
accessMode: ReadWriteMany
size: 10Gi
modelCache:
enabled: true
storageClass: ""
accessMode: ReadWriteMany
size: 10Gi
autoscaling: autoscaling:
enabled: false enabled: false
minReplicas: 1 minReplicas: 1
maxReplicas: 3 maxReplicas: 3
targetCPUUtilizationPercentage: 80 targetCPUUtilizationPercentage: 80
targetMemoryUtilizationPercentage: 80 targetMemoryUtilizationPercentage: 80
resources: {} resources: {}
livenessProbe: livenessProbe:
tcpSocket: tcpSocket:
port: 2283 port: 3003
initialDelaySeconds: 30 initialDelaySeconds: 30
timeoutSeconds: 15 timeoutSeconds: 15
successThreshold: 1 successThreshold: 1
failureThreshold: 3 failureThreshold: 3
periodSeconds: 10 periodSeconds: 10
readinessProbe: readinessProbe:
tcpSocket: tcpSocket:
port: 2283 port: 3003
initialDelaySeconds: 15 initialDelaySeconds: 15
timeoutSeconds: 2 timeoutSeconds: 2
successThreshold: 1 successThreshold: 1
failureThreshold: 3 failureThreshold: 3
periodSeconds: 10 periodSeconds: 10
nodeSelector: {} nodeSelector: {}
tolerations: [] tolerations: []
affinity: {} affinity: {}
env: {} persistence:
modelCache:
enabled: true
storageClass: ""
accessMode: ReadWriteMany
size: 10Gi
secret: secret:
enabled: false enabled: false