From 2dc5408361fd1bb6d2fc5a79111f99501a37fb03 Mon Sep 17 00:00:00 2001 From: Stavros kois Date: Tue, 21 Nov 2023 10:09:52 +0200 Subject: [PATCH] fix urls --- .../community/immich/templates/_immich-machinelearning.tpl | 2 +- .../community/immich/templates/_immich-microservices.tpl | 2 +- .../ix-dev/community/immich/templates/_immich-server.tpl | 6 +++--- .../ix-dev/community/immich/templates/_immich-typesense.tpl | 2 +- library/ix-dev/community/immich/templates/_waitURL.tpl | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/library/ix-dev/community/immich/templates/_immich-machinelearning.tpl b/library/ix-dev/community/immich/templates/_immich-machinelearning.tpl index 7c9efc8542..5c7325fd21 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.webuiPort }} +{{- $url := printf "http://%v-server:%v/api/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 52ddf5f5e6..7538c6304d 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.webuiPort }} +{{- $url := printf "http://%v-server:%v/api/server-info/ping" $fullname .Values.immichNetwork.webuiPort }} workload: microservices: enabled: true diff --git a/library/ix-dev/community/immich/templates/_immich-server.tpl b/library/ix-dev/community/immich/templates/_immich-server.tpl index 9c2ef5872c..288d2870e8 100644 --- a/library/ix-dev/community/immich/templates/_immich-server.tpl +++ b/library/ix-dev/community/immich/templates/_immich-server.tpl @@ -31,17 +31,17 @@ workload: liveness: enabled: true type: http - path: /server-info/ping + path: /api/server-info/ping port: {{ .Values.immichNetwork.webuiPort }} readiness: enabled: true type: http - path: /server-info/ping + path: /api/server-info/ping port: {{ .Values.immichNetwork.webuiPort }} startup: enabled: true type: http - path: /server-info/ping + path: /api/server-info/ping port: {{ .Values.immichNetwork.webuiPort }} initContainers: {{- include "ix.v1.common.app.postgresWait" (dict "name" "postgres-wait" diff --git a/library/ix-dev/community/immich/templates/_immich-typesense.tpl b/library/ix-dev/community/immich/templates/_immich-typesense.tpl index 2feb8b7a41..f78e1d5f3f 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.webuiPort }} +{{- $url := printf "http://%v-server:%v/api/server-info/ping" $fullname .Values.immichNetwork.webuiPort }} workload: typesense: enabled: true diff --git a/library/ix-dev/community/immich/templates/_waitURL.tpl b/library/ix-dev/community/immich/templates/_waitURL.tpl index 7c109c0000..cdacbb988f 100644 --- a/library/ix-dev/community/immich/templates/_waitURL.tpl +++ b/library/ix-dev/community/immich/templates/_waitURL.tpl @@ -9,7 +9,7 @@ wait-url: - -c - | echo "Pinging [{{ $url }}] until it is ready..." - until wget --spider --quiet "{{ $url }}"; do + until wget --spider --quiet --timeout=3 --tries=1 "{{ $url }}"; do echo "Waiting for [{{ $url }}] to be ready..." sleep 2 done