diff --git a/charts/immich/Chart.yaml b/charts/immich/Chart.yaml index 9f46ad14..06ab650f 100644 --- a/charts/immich/Chart.yaml +++ b/charts/immich/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 description: A chart to power Immich (immich.app) running on kubernetes name: immich -version: 0.6.0 -appVersion: v1.100.0 +version: 0.7.0 +appVersion: v1.106.1 home: https://immich.app/ icon: https://raw.githubusercontent.com/immich-app/immich/main/design/immich-logo.svg sources: diff --git a/charts/immich/templates/microservices.yaml b/charts/immich/templates/microservices.yaml deleted file mode 100644 index 2ca4ec6f..00000000 --- a/charts/immich/templates/microservices.yaml +++ /dev/null @@ -1,62 +0,0 @@ -{{- define "immich.microservices.hardcodedValues" -}} -global: - nameOverride: microservices - -command: "/bin/sh" -args: - - "./start-microservices.sh" - -env: - {{ if .Values.immich.metrics.enabled }} - IMMICH_METRICS: true - {{ end }} - {{- if .Values.immich.configuration }} - IMMICH_CONFIG_FILE: /config/immich-config.yaml - {{- end }} - -{{- if .Values.immich.configuration }} -podAnnotations: - checksum/config: {{ .Values.immich.configuration | toYaml | sha256sum }} -{{- end }} - -service: - main: - enabled: {{ .Values.immich.metrics.enabled }} - type: ClusterIP - ports: - http: - enabled: false - primary: true - port: 3002 - protocol: HTTP - metrics: - enabled: {{ .Values.immich.metrics.enabled }} - port: 8081 - protocol: HTTP - -serviceMonitor: - main: - enabled: {{ .Values.immich.metrics.enabled }} - endpoints: - - port: metrics - scheme: http - -persistence: -{{- if .Values.immich.configuration }} - config: - enabled: true - type: configMap - name: {{ .Release.Name }}-immich-config -{{- end }} - library: - enabled: true - mountPath: /usr/src/app/upload - existingClaim: {{ .Values.immich.persistence.library.existingClaim }} -{{- end }} - -{{ if .Values.microservices.enabled }} -{{- $ctx := deepCopy . -}} -{{- $_ := get .Values "microservices" | mergeOverwrite $ctx.Values -}} -{{- $_ = include "immich.microservices.hardcodedValues" . | fromYaml | merge $ctx.Values -}} -{{- include "bjw-s.common.loader.all" $ctx }} -{{ end }} \ No newline at end of file diff --git a/charts/immich/templates/server.yaml b/charts/immich/templates/server.yaml index b7edf2d7..d78e4f69 100644 --- a/charts/immich/templates/server.yaml +++ b/charts/immich/templates/server.yaml @@ -2,10 +2,6 @@ global: nameOverride: server -command: "/bin/sh" -args: - - "./start-server.sh" - env: {{ if .Values.immich.metrics.enabled }} IMMICH_METRICS: true @@ -30,16 +26,23 @@ service: primary: true port: 3001 protocol: HTTP - metrics: + metrics-api: enabled: {{ .Values.immich.metrics.enabled }} port: 8081 protocol: HTTP + metrics-ms: + enabled: {{ .Values.immich.metrics.enabled }} + port: 8082 + protocol: HTTP + serviceMonitor: main: enabled: {{ .Values.immich.metrics.enabled }} endpoints: - - port: metrics + - port: metrics-api + scheme: http + - port: metrics-ms scheme: http probes: @@ -76,4 +79,4 @@ persistence: {{- $_ := get .Values "server" | mergeOverwrite $ctx.Values -}} {{- $_ = include "immich.server.hardcodedValues" . | fromYaml | merge $ctx.Values -}} {{- include "bjw-s.common.loader.all" $ctx }} -{{ end }} \ No newline at end of file +{{ end }} diff --git a/charts/immich/values.yaml b/charts/immich/values.yaml index e2d6f634..01184bc2 100644 --- a/charts/immich/values.yaml +++ b/charts/immich/values.yaml @@ -14,7 +14,7 @@ env: IMMICH_MACHINE_LEARNING_URL: '{{ printf "http://%s-machine-learning:3003" .Release.Name }}' image: - tag: v1.100.0 + tag: v1.106.1 immich: metrics: @@ -83,12 +83,6 @@ server: - path: "/" tls: [] -microservices: - enabled: true - image: - repository: ghcr.io/immich-app/immich-server - pullPolicy: IfNotPresent - machine-learning: enabled: true image: