diff --git a/library/ix-dev/community/immich/Chart.yaml b/library/ix-dev/community/immich/Chart.yaml index 8f2971cfca..86957e20aa 100644 --- a/library/ix-dev/community/immich/Chart.yaml +++ b/library/ix-dev/community/immich/Chart.yaml @@ -3,9 +3,9 @@ description: Immich annotations: title: Immich type: application -version: 1.1.1 +version: 1.2.0 apiVersion: v2 -appVersion: 1.87.0 +appVersion: 1.88.0 kubeVersion: '>=1.16.0-0' maintainers: - name: truenas diff --git a/library/ix-dev/community/immich/templates/_configuration.tpl b/library/ix-dev/community/immich/templates/_configuration.tpl index 8dac89603e..b44040d76a 100644 --- a/library/ix-dev/community/immich/templates/_configuration.tpl +++ b/library/ix-dev/community/immich/templates/_configuration.tpl @@ -87,7 +87,11 @@ configmap: data: LOG_LEVEL: log NODE_ENV: production - SERVER_PORT: {{ .Values.immichNetwork.serverPort | quote }} + SERVER_PORT: {{ .Values.immichNetwork.webuiPort | quote }} + IMMICH_SERVER_URL: {{ printf "http://%v-server:%v/api" $fullname .Values.immichNetwork.webuiPort }} + {{- with .Values.immichConfig.publicLoginMessage }} + PUBLIC_LOGIN_PAGE_MESSAGE: {{ . | quote }} + {{- end }} micro-config: enabled: true @@ -97,23 +101,6 @@ configmap: MICROSERVICES_PORT: {{ .Values.immichNetwork.microservicesPort | quote }} REVERSE_GEOCODING_DUMP_DIRECTORY: /microcache - web-config: - enabled: true - data: - NODE_ENV: production - PORT: {{ .Values.immichNetwork.webPort | quote }} - IMMICH_SERVER_URL: {{ printf "http://%v-server:%v" $fullname .Values.immichNetwork.serverPort }} - PUBLIC_IMMICH_SERVER_URL: {{ printf "http://%v-server:%v" $fullname .Values.immichNetwork.serverPort }} - {{- with .Values.immichConfig.publicLoginMessage }} - PUBLIC_LOGIN_PAGE_MESSAGE: {{ . | quote }} - {{- end }} - - proxy-config: - enabled: true - data: - IMMICH_WEB_URL: {{ printf "http://%v-web:%v" $fullname .Values.immichNetwork.webPort }} - IMMICH_SERVER_URL: {{ printf "http://%v-server:%v" $fullname .Values.immichNetwork.serverPort }} - {{- if .Values.immichConfig.enableML }} ml-config: enabled: true diff --git a/library/ix-dev/community/immich/templates/_immich-machinelearning.tpl b/library/ix-dev/community/immich/templates/_immich-machinelearning.tpl index 1f6479b9be..7c9efc8542 100644 --- a/library/ix-dev/community/immich/templates/_immich-machinelearning.tpl +++ b/library/ix-dev/community/immich/templates/_immich-machinelearning.tpl @@ -1,6 +1,6 @@ {{- define "immich.machinelearning.workload" -}} {{- $fullname := (include "ix.v1.common.lib.chart.names.fullname" $) -}} -{{- $url := printf "http://%v-server:%v/server-info/ping" $fullname .Values.immichNetwork.serverPort }} +{{- $url := printf "http://%v-server:%v/server-info/ping" $fullname .Values.immichNetwork.webuiPort }} workload: machinelearning: enabled: true diff --git a/library/ix-dev/community/immich/templates/_immich-microservices.tpl b/library/ix-dev/community/immich/templates/_immich-microservices.tpl index 4a351f0f97..52ddf5f5e6 100644 --- a/library/ix-dev/community/immich/templates/_immich-microservices.tpl +++ b/library/ix-dev/community/immich/templates/_immich-microservices.tpl @@ -1,6 +1,6 @@ {{- define "immich.microservices.workload" -}} {{- $fullname := (include "ix.v1.common.lib.chart.names.fullname" $) -}} -{{- $url := printf "http://%v-server:%v/server-info/ping" $fullname .Values.immichNetwork.serverPort }} +{{- $url := printf "http://%v-server:%v/server-info/ping" $fullname .Values.immichNetwork.webuiPort }} workload: microservices: enabled: true diff --git a/library/ix-dev/community/immich/templates/_immich-proxy.tpl b/library/ix-dev/community/immich/templates/_immich-proxy.tpl deleted file mode 100644 index 95feed8cd7..0000000000 --- a/library/ix-dev/community/immich/templates/_immich-proxy.tpl +++ /dev/null @@ -1,48 +0,0 @@ -{{- define "immich.proxy.workload" -}} -{{- $fullname := (include "ix.v1.common.lib.chart.names.fullname" $) -}} -{{- $serverUrl := printf "http://%v-server:%v/server-info/ping" $fullname .Values.immichNetwork.serverPort -}} -{{- $webUrl := printf "http://%v-web:%v/robots.txt" $fullname .Values.immichNetwork.webPort }} -workload: - proxy: - enabled: true - type: Deployment - podSpec: - hostNetwork: false - containers: - proxy: - enabled: true - primary: true - imageSelector: proxyImage - securityContext: - runAsUser: 0 - runAsGroup: 0 - runAsNonRoot: false - readOnlyRootFilesystem: false - capabilities: - add: - - CHOWN - - SETUID - - SETGID - envFrom: - - configMapRef: - name: proxy-config - probes: - liveness: - enabled: true - type: http - path: /api/server-info/ping - port: 8080 - readiness: - enabled: true - type: http - path: /api/server-info/ping - port: 8080 - startup: - enabled: true - type: http - path: /api/server-info/ping - port: 8080 - initContainers: - {{- include "immich.wait.init" (dict "url" $serverUrl) | indent 8 }} - {{- include "immich.wait.init" (dict "url" $webUrl) | indent 8 }} -{{- end -}} diff --git a/library/ix-dev/community/immich/templates/_immich-server.tpl b/library/ix-dev/community/immich/templates/_immich-server.tpl index 5650656243..9c2ef5872c 100644 --- a/library/ix-dev/community/immich/templates/_immich-server.tpl +++ b/library/ix-dev/community/immich/templates/_immich-server.tpl @@ -32,17 +32,17 @@ workload: enabled: true type: http path: /server-info/ping - port: {{ .Values.immichNetwork.serverPort }} + port: {{ .Values.immichNetwork.webuiPort }} readiness: enabled: true type: http path: /server-info/ping - port: {{ .Values.immichNetwork.serverPort }} + port: {{ .Values.immichNetwork.webuiPort }} startup: enabled: true type: http path: /server-info/ping - port: {{ .Values.immichNetwork.serverPort }} + port: {{ .Values.immichNetwork.webuiPort }} initContainers: {{- include "ix.v1.common.app.postgresWait" (dict "name" "postgres-wait" "secretName" "postgres-creds") | nindent 8 }} diff --git a/library/ix-dev/community/immich/templates/_immich-typesense.tpl b/library/ix-dev/community/immich/templates/_immich-typesense.tpl index 53dd8958a4..2feb8b7a41 100644 --- a/library/ix-dev/community/immich/templates/_immich-typesense.tpl +++ b/library/ix-dev/community/immich/templates/_immich-typesense.tpl @@ -1,6 +1,6 @@ {{- define "immich.typesense.workload" -}} {{- $fullname := (include "ix.v1.common.lib.chart.names.fullname" $) -}} -{{- $url := printf "http://%v-server:%v/server-info/ping" $fullname .Values.immichNetwork.serverPort }} +{{- $url := printf "http://%v-server:%v/server-info/ping" $fullname .Values.immichNetwork.webuiPort }} workload: typesense: enabled: true diff --git a/library/ix-dev/community/immich/templates/_immich-web.tpl b/library/ix-dev/community/immich/templates/_immich-web.tpl deleted file mode 100644 index a932895c32..0000000000 --- a/library/ix-dev/community/immich/templates/_immich-web.tpl +++ /dev/null @@ -1,45 +0,0 @@ -{{- define "immich.web.workload" -}} -{{- $fullname := (include "ix.v1.common.lib.chart.names.fullname" $) -}} -{{- $url := printf "http://%v-server:%v/server-info/ping" $fullname .Values.immichNetwork.serverPort }} -workload: - web: - enabled: true - type: Deployment - podSpec: - hostNetwork: false - containers: - web: - enabled: true - primary: true - imageSelector: webImage - securityContext: - runAsUser: 0 - runAsGroup: 0 - runAsNonRoot: false - readOnlyRootFilesystem: false - capabilities: - add: - - SETUID - - SETGID - envFrom: - - configMapRef: - name: web-config - probes: - liveness: - enabled: true - type: http - path: /robots.txt - port: {{ .Values.immichNetwork.webPort }} - readiness: - enabled: true - type: http - path: /robots.txt - port: {{ .Values.immichNetwork.webPort }} - startup: - enabled: true - type: http - path: /robots.txt - port: {{ .Values.immichNetwork.webPort }} - initContainers: - {{- include "immich.wait.init" (dict "url" $url) | indent 8 }} -{{- end -}} diff --git a/library/ix-dev/community/immich/templates/_persistence.tpl b/library/ix-dev/community/immich/templates/_persistence.tpl index 6ba08c8474..b16d12e86e 100644 --- a/library/ix-dev/community/immich/templates/_persistence.tpl +++ b/library/ix-dev/community/immich/templates/_persistence.tpl @@ -1,12 +1,4 @@ {{- define "immich.persistence" -}} - {{- include "immich.storage.ci.migration" (dict "storage" .Values.immichStorage.pgData) }} - {{- include "immich.storage.ci.migration" (dict "storage" .Values.immichStorage.pgBackup) }} - {{- include "immich.storage.ci.migration" (dict "storage" .Values.immichStorage.library) }} - {{- include "immich.storage.ci.migration" (dict "storage" .Values.immichStorage.uploads) }} - {{- include "immich.storage.ci.migration" (dict "storage" .Values.immichStorage.thumbs) }} - {{- include "immich.storage.ci.migration" (dict "storage" .Values.immichStorage.profile) }} - {{- include "immich.storage.ci.migration" (dict "storage" .Values.immichStorage.video) }} - persistence: {{/* Data */}} library: @@ -62,7 +54,6 @@ persistence: {{- range $idx, $storage := .Values.immichStorage.additionalStorages }} {{ printf "immich-%v:" (int $idx) }} enabled: true - {{- include "immich.storage.ci.migration" (dict "storage" $storage) }} {{- include "ix.v1.common.app.storageOptions" (dict "storage" $storage) | nindent 4 }} targetSelector: server: @@ -120,13 +111,3 @@ persistence: "pgBackup" .Values.immichStorage.pgBackup ) | nindent 2 }} {{- end -}} - -{{/* Can be removed on the next bump (1.1.0+), only used for CI values */}} -{{- define "immich.storage.ci.migration" -}} - {{- $storage := .storage -}} - - {{- if $storage.hostPath -}} - {{- $_ := set $storage "hostPathConfig" dict -}} - {{- $_ := set $storage.hostPathConfig "hostPath" $storage.hostPath -}} - {{- end -}} -{{- end -}} diff --git a/library/ix-dev/community/immich/templates/_service.tpl b/library/ix-dev/community/immich/templates/_service.tpl index bc1f83a5cf..452067dbc1 100644 --- a/library/ix-dev/community/immich/templates/_service.tpl +++ b/library/ix-dev/community/immich/templates/_service.tpl @@ -1,44 +1,19 @@ {{- define "immich.service" -}} service: - proxy: + server: enabled: true primary: true type: NodePort - targetSelector: proxy - ports: - proxy: - enabled: true - primary: true - port: {{ .Values.immichNetwork.webuiPort }} - nodePort: {{ .Values.immichNetwork.webuiPort }} - protocol: http - targetPort: 8080 - targetSelector: proxy - - server: - enabled: true - type: ClusterIP targetSelector: server ports: server: enabled: true primary: true - port: {{ .Values.immichNetwork.serverPort }} + port: {{ .Values.immichNetwork.webuiPort }} + nodePort: {{ .Values.immichNetwork.webuiPort }} protocol: http targetSelector: server - web: - enabled: true - type: ClusterIP - targetSelector: web - ports: - web: - enabled: true - primary: true - port: {{ .Values.immichNetwork.webPort }} - protocol: http - targetSelector: web - microservices: enabled: true type: ClusterIP diff --git a/library/ix-dev/community/immich/templates/common.yaml b/library/ix-dev/community/immich/templates/common.yaml index 3a4b911709..bb30b02fad 100644 --- a/library/ix-dev/community/immich/templates/common.yaml +++ b/library/ix-dev/community/immich/templates/common.yaml @@ -7,8 +7,6 @@ {{- if .Values.immichConfig.enableML -}} {{- $_ := mustMergeOverwrite .Values (include "immich.machinelearning.workload" $ | fromYaml) -}} {{- end -}} -{{- $_ := mustMergeOverwrite .Values (include "immich.web.workload" $ | fromYaml) -}} -{{- $_ := mustMergeOverwrite .Values (include "immich.proxy.workload" $ | fromYaml) -}} {{- if .Values.immichConfig.enableTypesense -}} {{- $_ := mustMergeOverwrite .Values (include "immich.typesense.workload" $ | fromYaml) -}} {{- end -}} diff --git a/library/ix-dev/community/immich/values.yaml b/library/ix-dev/community/immich/values.yaml index 87ce0077a9..2598f4d1b1 100644 --- a/library/ix-dev/community/immich/values.yaml +++ b/library/ix-dev/community/immich/values.yaml @@ -1,22 +1,12 @@ image: repository: altran1502/immich-server pullPolicy: IfNotPresent - tag: v1.87.0 - -webImage: - repository: altran1502/immich-web - pullPolicy: IfNotPresent - tag: v1.87.0 - -proxyImage: - repository: altran1502/immich-proxy - pullPolicy: IfNotPresent - tag: v1.87.0 + tag: v1.88.0 mlImage: repository: altran1502/immich-machine-learning pullPolicy: IfNotPresent - tag: v1.87.0 + tag: v1.88.0 typesenseImage: repository: typesense/typesense @@ -40,8 +30,6 @@ immichNetwork: # Not user configurable, will be hidden on UI # Putting it here in case it needs to be configurable # in the future. - serverPort: 32000 - webPort: 32001 machinelearningPort: 32002 microservicesPort: 32003 typesensePort: 32004