diff --git a/charts/stable/immich/Chart.yaml b/charts/stable/immich/Chart.yaml index f2fd0a82b85a..d47b1d773b87 100644 --- a/charts/stable/immich/Chart.yaml +++ b/charts/stable/immich/Chart.yaml @@ -7,7 +7,7 @@ annotations: truecharts.org/min_helm_version: "3.11" truecharts.org/train: stable apiVersion: v2 -appVersion: 1.105.1 +appVersion: 1.106.3 dependencies: - name: common version: 24.0.1 @@ -41,4 +41,4 @@ sources: - https://hub.docker.com/r/altran1502/immich-machine-learning - https://hub.docker.com/r/altran1502/immich-server type: application -version: 16.0.1 +version: 17.0.0 diff --git a/charts/stable/immich/templates/_config.tpl b/charts/stable/immich/templates/_config.tpl index 28411dc1495b..b1a4e2f6bfd5 100644 --- a/charts/stable/immich/templates/_config.tpl +++ b/charts/stable/immich/templates/_config.tpl @@ -5,20 +5,22 @@ configmap: server-config: enabled: true data: - SERVER_PORT: {{ .Values.service.main.ports.main.port | quote }} + IMMICH_PORT: {{ .Values.service.main.ports.main.port | quote }} + IMMICH_WORKERS_INCLUDE: api micro-config: enabled: true data: - MICROSERVICES_PORT: {{ .Values.service.microservices.ports.microservices.port | quote }} + IMMICH_PORT: {{ .Values.service.microservices.ports.microservices.port | quote }} REVERSE_GEOCODING_DUMP_DIRECTORY: {{ .Values.persistence.microcache.targetSelector.microservices.microservices.mountPath }} + IMMICH_WORKERS_EXCLUDE: api {{- if .Values.immich.enable_ml }} ml-config: enabled: true data: NODE_ENV: production - MACHINE_LEARNING_PORT: {{ .Values.service.machinelearning.ports.machinelearning.port | quote }} + IMMICH_PORT: {{ .Values.service.machinelearning.ports.machinelearning.port | quote }} MACHINE_LEARNING_CACHE_FOLDER: {{ .Values.persistence.mlcache.targetSelector.machinelearning.machinelearning.mountPath }} TRANSFORMERS_CACHE: {{ .Values.persistence.mlcache.targetSelector.machinelearning.machinelearning.mountPath }} {{- end }} @@ -28,7 +30,7 @@ configmap: enabled: true data: NODE_ENV: production - LOG_LEVEL: {{ .Values.immich.log_level }} + IMMICH_LOG_LEVEL: {{ .Values.immich.log_level }} IMMICH_MACHINE_LEARNING_ENABLED: {{ .Values.immich.enable_ml | quote }} {{- if .Values.immich.enable_ml }} IMMICH_MACHINE_LEARNING_URL: {{ printf "http://%v-machinelearning:%v" $fname .Values.service.machinelearning.ports.machinelearning.port }} diff --git a/charts/stable/immich/templates/_microservices.tpl b/charts/stable/immich/templates/_microservices.tpl index 5c28950a3470..6b7f7dee296f 100644 --- a/charts/stable/immich/templates/_microservices.tpl +++ b/charts/stable/immich/templates/_microservices.tpl @@ -13,10 +13,6 @@ podSpec: enabled: true primary: true imageSelector: image - command: /bin/sh - args: - - -c - - /usr/src/app/start-microservices.sh securityContext: capabilities: disableS6Caps: true @@ -30,14 +26,23 @@ podSpec: probes: readiness: enabled: true - type: tcp - port: {{ .Values.service.microservices.ports.microservices.port }} + type: exec + command: + - npm + - run + - healthcheck liveness: enabled: true - type: tcp - port: {{ .Values.service.microservices.ports.microservices.port }} + type: exec + command: + - npm + - run + - healthcheck startup: enabled: true - type: tcp - port: {{ .Values.service.microservices.ports.microservices.port }} + type: exec + command: + - npm + - run + - healthcheck {{- end -}} diff --git a/charts/stable/immich/templates/_server.tpl b/charts/stable/immich/templates/_server.tpl index 89a112ccd31d..b07fc1782f0d 100644 --- a/charts/stable/immich/templates/_server.tpl +++ b/charts/stable/immich/templates/_server.tpl @@ -4,10 +4,6 @@ primary: true imageSelector: image resources: excludeExtra: true -command: /bin/sh -args: - - -c - - /usr/src/app/start-server.sh securityContext: capabilities: disableS6Caps: true @@ -21,17 +17,23 @@ envFrom: probes: liveness: enabled: true - type: http - path: /api/server-info/ping - port: {{ .Values.service.main.ports.main.port }} + type: exec + command: + - npm + - run + - healthcheck readiness: enabled: true - type: http - path: /api/server-info/ping - port: {{ .Values.service.main.ports.main.port }} + type: exec + command: + - npm + - run + - healthcheck startup: enabled: true - type: http - path: /api/server-info/ping - port: {{ .Values.service.main.ports.main.port }} + type: exec + command: + - npm + - run + - healthcheck {{- end -}} diff --git a/charts/stable/immich/values.yaml b/charts/stable/immich/values.yaml index 391c9e35e0a5..91cd73373223 100644 --- a/charts/stable/immich/values.yaml +++ b/charts/stable/immich/values.yaml @@ -1,22 +1,22 @@ image: repository: altran1502/immich-server - tag: v1.105.1@sha256:658b40420d7a39d6eb34c797cec8d36ff315f5adb168301aaf27dc4eafc8e228 + tag: v1.106.3 pullPolicy: IfNotPresent mlImage: repository: altran1502/immich-machine-learning pullPolicy: IfNotPresent - tag: v1.105.1@sha256:2e2736ba2f2270485c0b6fa33eee66ea0b2279b70b92ea838a015c4d5289c9f0 + tag: v1.106.3 mlCudaImage: repository: altran1502/immich-machine-learning pullPolicy: IfNotPresent - tag: v1.105.1-cuda@sha256:6c34f6cfc85b1a34336e8eb2cf5ce14ec585395e404d4566826e8bf16e1a441b + tag: v1.106.3-cuda mlOpenvinoImage: repository: altran1502/immich-machine-learning pullPolicy: IfNotPresent - tag: v1.105.1-openvino@sha256:7675497197b8600316d942444fb9f88106a91091b5011a806988a4afad0dc0cb + tag: v1.106.3-openvino securityContext: container: