From e8b9cbf6cac437dd5738bf54c99346410923c8e6 Mon Sep 17 00:00:00 2001 From: Samuel Date: Tue, 11 Jun 2024 12:42:17 +0000 Subject: [PATCH 1/6] remove microservice component --- charts/immich/templates/microservices.yaml | 62 ---------------------- charts/immich/values.yaml | 6 --- 2 files changed, 68 deletions(-) delete mode 100644 charts/immich/templates/microservices.yaml 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/values.yaml b/charts/immich/values.yaml index e2d6f634..c414a4fb 100644 --- a/charts/immich/values.yaml +++ b/charts/immich/values.yaml @@ -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: From c9d071a077da7a5da45dd04d2424411ed9766758 Mon Sep 17 00:00:00 2001 From: Samuel Date: Tue, 11 Jun 2024 12:43:01 +0000 Subject: [PATCH 2/6] remove unnecessary command & arguments override --- charts/immich/templates/server.yaml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/charts/immich/templates/server.yaml b/charts/immich/templates/server.yaml index b7edf2d7..1701465a 100644 --- a/charts/immich/templates/server.yaml +++ b/charts/immich/templates/server.yaml @@ -1,11 +1,7 @@ {{- define "immich.server.hardcodedValues" -}} global: nameOverride: server - -command: "/bin/sh" -args: - - "./start-server.sh" - + env: {{ if .Values.immich.metrics.enabled }} IMMICH_METRICS: true From 9021836214cff29c2741e99774ea8796d1efb34d Mon Sep 17 00:00:00 2001 From: Samuel Date: Tue, 11 Jun 2024 12:44:24 +0000 Subject: [PATCH 3/6] match latest version of image with chart --- charts/immich/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/immich/values.yaml b/charts/immich/values.yaml index c414a4fb..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: From 186294eb083865a2000e6ef1da623f1d9ea64965 Mon Sep 17 00:00:00 2001 From: Samuel Date: Tue, 11 Jun 2024 12:52:08 +0000 Subject: [PATCH 4/6] update chart version --- charts/immich/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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: From 48f70db71678b6b5a89ed6acd4d44122baa34d7d Mon Sep 17 00:00:00 2001 From: obito1903 Date: Tue, 11 Jun 2024 15:55:16 +0200 Subject: [PATCH 5/6] add metric port for microservices --- charts/immich/templates/server.yaml | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/charts/immich/templates/server.yaml b/charts/immich/templates/server.yaml index 1701465a..13840979 100644 --- a/charts/immich/templates/server.yaml +++ b/charts/immich/templates/server.yaml @@ -1,7 +1,7 @@ {{- define "immich.server.hardcodedValues" -}} global: nameOverride: server - + env: {{ if .Values.immich.metrics.enabled }} IMMICH_METRICS: true @@ -26,16 +26,23 @@ service: primary: true port: 3001 protocol: HTTP - metrics: + metrics-api: enabled: {{ .Values.immich.metrics.enabled }} port: 8081 protocol: HTTP + metrics-microservices: + 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-microservices scheme: http probes: @@ -72,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 }} From c44043c1d4e59eb7f25120d1d1d09a299c55e253 Mon Sep 17 00:00:00 2001 From: obito1903 Date: Tue, 11 Jun 2024 16:00:21 +0200 Subject: [PATCH 6/6] fix port name length --- charts/immich/templates/server.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/immich/templates/server.yaml b/charts/immich/templates/server.yaml index 13840979..d78e4f69 100644 --- a/charts/immich/templates/server.yaml +++ b/charts/immich/templates/server.yaml @@ -30,7 +30,7 @@ service: enabled: {{ .Values.immich.metrics.enabled }} port: 8081 protocol: HTTP - metrics-microservices: + metrics-ms: enabled: {{ .Values.immich.metrics.enabled }} port: 8082 protocol: HTTP @@ -42,7 +42,7 @@ serviceMonitor: endpoints: - port: metrics-api scheme: http - - port: metrics-microservices + - port: metrics-ms scheme: http probes: