From d5af53ba3601523344cfa52cddfa2b952f121d43 Mon Sep 17 00:00:00 2001 From: jfrazx Date: Fri, 20 Dec 2024 11:04:28 -0800 Subject: [PATCH] feat(apps): update immich --- charts/stable/immich/Chart.yaml | 12 +++---- charts/stable/immich/README.md | 15 ++------- .../immich/templates/_machinelearning.tpl | 2 +- .../immich/templates/_microservices.tpl | 17 +++------- charts/stable/immich/templates/_server.tpl | 15 ++------- charts/stable/immich/values.yaml | 32 ++++++++++++++----- 6 files changed, 40 insertions(+), 53 deletions(-) diff --git a/charts/stable/immich/Chart.yaml b/charts/stable/immich/Chart.yaml index 41ae5c773fa23..68623f73b0360 100644 --- a/charts/stable/immich/Chart.yaml +++ b/charts/stable/immich/Chart.yaml @@ -6,17 +6,17 @@ annotations: truecharts.org/min_helm_version: "3.11" truecharts.org/train: stable apiVersion: v2 -appVersion: 1.106.4 +appVersion: 1.121.0 dependencies: - name: common - version: 24.1.5 + version: 25.1.7 repository: oci://tccr.io/truecharts condition: "" alias: "" tags: [] import-values: [] - name: redis - version: 15.1.3 + version: 15.3.2 repository: oci://tccr.io/truecharts condition: redis.enabled alias: "" @@ -35,9 +35,9 @@ maintainers: url: https://truecharts.org name: immich sources: + - https://ghcr.io/immich-app/immich-machine-learning + - https://ghcr.io/immich-app/immich-server - https://github.com/immich-app/immich - https://github.com/truecharts/charts/tree/master/charts/stable/immich - - https://hub.docker.com/r/altran1502/immich-machine-learning - - https://hub.docker.com/r/altran1502/immich-server type: application -version: 17.2.1 +version: 17.26.0 diff --git a/charts/stable/immich/README.md b/charts/stable/immich/README.md index 56d2c621d50f6..7e1737ae53014 100644 --- a/charts/stable/immich/README.md +++ b/charts/stable/immich/README.md @@ -4,9 +4,6 @@ title: README ## General Info -TrueCharts can be installed as both _normal_ Helm Charts or as TrueNAS SCALE Apps. -Both solutions are fully supported, but we heavily advice the use of normal Helm Charts where possible - For more information about this Chart, please check the docs on the TrueCharts [website](https://truecharts.org/charts/stable/immich) **This chart is not maintained by the upstream project and any issues with the chart should be raised [here](https://github.com/truecharts/charts/issues/new/choose)** @@ -21,11 +18,6 @@ To install TrueCharts Helm charts using Helm, you can use our OCI Repository. For more information on how to install TrueCharts Helm charts, checkout the [instructions on the website](/guides) - -### TrueNAS SCALE Apps - -For more information on how to use TrueCharts as TrueNAS SCALE Apps, please checkout the [quick-start guides for TrueNAS SCALE](/deprecated/scale). - ## Chart Specific Guides and information All our charts have dedicated documentation pages. @@ -34,16 +26,13 @@ https://truecharts.org/charts/stable/immich ## Configuration Options -Please note: For TrueNAS SCALE, only options available in the GUI are supported. -Hence most of these docs do not apply to TrueNAS SCALE - To view the chart specific options, please view Values.yaml included in the chart. -The most recent version of which, is available here: https://github.com/truecharts/charts/blob/master/charts/stable/immich/values.yaml +The most recent version of which, is available here: https://github.com/truecharts/public/blob/master/charts/stable/immich/values.yaml All our Charts use a shared "common" library chart that contains most of the templating and options. For the complete overview of all available options, please checkout the documentation for them on the [common docs on our website](/common) -For information about the common chart and all defaults included with it, please review its values.yaml file available here: https://github.com/truecharts/library-charts/blob/main/library/common/values.yaml +For information about the common chart and all defaults included with it, please review its values.yaml file available here: https://github.com/truecharts/public/blob/master/charts/library/common/values.yaml ## Support diff --git a/charts/stable/immich/templates/_machinelearning.tpl b/charts/stable/immich/templates/_machinelearning.tpl index f3068e46c3a82..875c2a6f1f660 100644 --- a/charts/stable/immich/templates/_machinelearning.tpl +++ b/charts/stable/immich/templates/_machinelearning.tpl @@ -1,7 +1,7 @@ {{/* Define the machinelearning container */}} {{- define "immich.machinelearning" -}} {{- $fname := (include "tc.v1.common.lib.chart.names.fullname" .) -}} -{{- $serverUrl := printf "http://%v:%v/api/server-info/ping" $fname .Values.service.main.ports.main.port }} +{{- $serverUrl := printf "http://%v:%v/api/server/ping" $fname .Values.service.main.ports.main.port }} {{- $img := "mlImage" -}} {{- with .Values.immich.mlImageType -}} {{- $img = . -}} diff --git a/charts/stable/immich/templates/_microservices.tpl b/charts/stable/immich/templates/_microservices.tpl index 6b7f7dee296f1..a4c148373f6a7 100644 --- a/charts/stable/immich/templates/_microservices.tpl +++ b/charts/stable/immich/templates/_microservices.tpl @@ -1,6 +1,6 @@ {{- define "immich.microservices" -}} {{- $fname := (include "tc.v1.common.lib.chart.names.fullname" .) -}} -{{- $serverUrl := printf "http://%v:%v/api/server-info/ping" $fname .Values.service.main.ports.main.port }} +{{- $serverUrl := printf "http://%v:%v/api/server/ping" $fname .Values.service.main.ports.main.port }} enabled: true type: Deployment podSpec: @@ -27,22 +27,13 @@ podSpec: readiness: enabled: true type: exec - command: - - npm - - run - - healthcheck + command: /usr/src/app/bin/immich-healthcheck liveness: enabled: true type: exec - command: - - npm - - run - - healthcheck + command: /usr/src/app/bin/immich-healthcheck startup: enabled: true type: exec - command: - - npm - - run - - healthcheck + command: /usr/src/app/bin/immich-healthcheck {{- end -}} diff --git a/charts/stable/immich/templates/_server.tpl b/charts/stable/immich/templates/_server.tpl index b07fc1782f0dd..d207344bb7252 100644 --- a/charts/stable/immich/templates/_server.tpl +++ b/charts/stable/immich/templates/_server.tpl @@ -18,22 +18,13 @@ probes: liveness: enabled: true type: exec - command: - - npm - - run - - healthcheck + command: /usr/src/app/bin/immich-healthcheck readiness: enabled: true type: exec - command: - - npm - - run - - healthcheck + command: /usr/src/app/bin/immich-healthcheck startup: enabled: true type: exec - command: - - npm - - run - - healthcheck + command: /usr/src/app/bin/immich-healthcheck {{- end -}} diff --git a/charts/stable/immich/values.yaml b/charts/stable/immich/values.yaml index d520793dc1345..882856137b90d 100644 --- a/charts/stable/immich/values.yaml +++ b/charts/stable/immich/values.yaml @@ -1,22 +1,22 @@ image: - repository: altran1502/immich-server - tag: v1.106.4@sha256:d39cb7ecbcc9924f2c51a3e0deb8a469075996c6ba9e1384eb2ddb550984848e + repository: ghcr.io/immich-app/immich-server + tag: v1.121.0@sha256:851c02f28891f1854c5b5762ee8d2e254e2de528cfe3627b2fbcb37a7f108ff3 pullPolicy: IfNotPresent mlImage: - repository: altran1502/immich-machine-learning + repository: ghcr.io/immich-app/immich-machine-learning pullPolicy: IfNotPresent - tag: v1.106.4@sha256:9db20e5c2033bef01fa2be50fa0a2c3d62e43f069aedde4d49a65e65a436d40b + tag: v1.121.0@sha256:1b8494bb9fe2194f2dc72c4d6b0104e16718f50e8772d54ade57909770816ad1 mlCudaImage: - repository: altran1502/immich-machine-learning + repository: ghcr.io/immich-app/immich-machine-learning pullPolicy: IfNotPresent - tag: v1.106.4-cuda@sha256:f6f53566dbe5582502e2738c5b7a546dfcbe09b5d87c3c156b3090659e187a6a + tag: v1.121.0-cuda@sha256:c10ebb0bd206e17cd24dc9e65390fad2f9ef9c636889759b3bff35f82b0e351c mlOpenvinoImage: - repository: altran1502/immich-machine-learning + repository: ghcr.io/immich-app/immich-machine-learning pullPolicy: IfNotPresent - tag: v1.106.4-openvino@sha256:6e1a3ebe612f1812fb16eaf405813112e7abf6bdb390ec9ca3cdae603228f165 + tag: v1.121.0-openvino@sha256:d5ed294419b11cb5eb746bb47628ade057a38d27031be89ab83866a74712bae6 securityContext: container: @@ -95,6 +95,15 @@ persistence: main: {} microservices: microservices: {} + backups: + enabled: true + mountPath: /usr/src/app/upload/backups + targetSelector: + # Main pod/container is server + main: + main: {} + microservices: + microservices: {} thumbs: enabled: true mountPath: /usr/src/app/upload/thumbs @@ -148,3 +157,10 @@ redis: portal: open: enabled: true + +ingress: + main: + integrations: + homepage: + widget: + version: 2