From bc270bafa993dc1c1d7a000f9a2f39eaa1a11b25 Mon Sep 17 00:00:00 2001 From: sonicaj Date: Tue, 21 Nov 2023 16:57:51 +0000 Subject: [PATCH] Publish new changes in catalog --- .../immich/1.1.1/templates/_immich-proxy.tpl | 48 ------------------ .../immich/1.1.1/templates/_immich-web.tpl | 45 ---------------- community/immich/{1.1.1 => 2.0.0}/Chart.lock | 0 community/immich/{1.1.1 => 2.0.0}/Chart.yaml | 6 +-- community/immich/{1.1.1 => 2.0.0}/README.md | 0 .../immich/{1.1.1 => 2.0.0}/app-readme.md | 0 .../{1.1.1 => 2.0.0}/charts/common-1.2.3.tgz | Bin .../{1.1.1 => 2.0.0}/ci/basic-values.yaml | 0 .../{1.1.1 => 2.0.0}/ci/extra-values.yaml | 0 .../{1.1.1 => 2.0.0}/ci/no-extra-values.yaml | 0 .../{1.1.1 => 2.0.0}/ci/no-ml-values.yaml | 0 .../ci/no-typesenes-values.yaml | 0 .../immich/{1.1.1 => 2.0.0}/ix_values.yaml | 16 +----- .../immich/{1.1.1 => 2.0.0}/metadata.yaml | 0 .../{1.1.1 => 2.0.0}/migrations/migrate | 0 .../immich/{1.1.1 => 2.0.0}/questions.yaml | 8 +++ .../{1.1.1 => 2.0.0}/templates/NOTES.txt | 0 .../templates/_configuration.tpl | 22 ++------ .../templates/_immich-machinelearning.tpl | 2 +- .../templates/_immich-microservices.tpl | 2 +- .../templates/_immich-server.tpl | 12 ++--- .../templates/_immich-typesense.tpl | 2 +- .../templates/_persistence.tpl | 19 ------- .../{1.1.1 => 2.0.0}/templates/_portal.tpl | 0 .../{1.1.1 => 2.0.0}/templates/_postgres.tpl | 0 .../{1.1.1 => 2.0.0}/templates/_redis.tpl | 0 .../{1.1.1 => 2.0.0}/templates/_service.tpl | 31 ++--------- .../{1.1.1 => 2.0.0}/templates/_waitURL.tpl | 2 +- .../{1.1.1 => 2.0.0}/templates/common.yaml | 2 - 29 files changed, 30 insertions(+), 187 deletions(-) delete mode 100644 community/immich/1.1.1/templates/_immich-proxy.tpl delete mode 100644 community/immich/1.1.1/templates/_immich-web.tpl rename community/immich/{1.1.1 => 2.0.0}/Chart.lock (100%) rename community/immich/{1.1.1 => 2.0.0}/Chart.yaml (80%) rename community/immich/{1.1.1 => 2.0.0}/README.md (100%) rename community/immich/{1.1.1 => 2.0.0}/app-readme.md (100%) rename community/immich/{1.1.1 => 2.0.0}/charts/common-1.2.3.tgz (100%) rename community/immich/{1.1.1 => 2.0.0}/ci/basic-values.yaml (100%) rename community/immich/{1.1.1 => 2.0.0}/ci/extra-values.yaml (100%) rename community/immich/{1.1.1 => 2.0.0}/ci/no-extra-values.yaml (100%) rename community/immich/{1.1.1 => 2.0.0}/ci/no-ml-values.yaml (100%) rename community/immich/{1.1.1 => 2.0.0}/ci/no-typesenes-values.yaml (100%) rename community/immich/{1.1.1 => 2.0.0}/ix_values.yaml (87%) rename community/immich/{1.1.1 => 2.0.0}/metadata.yaml (100%) rename community/immich/{1.1.1 => 2.0.0}/migrations/migrate (100%) rename community/immich/{1.1.1 => 2.0.0}/questions.yaml (99%) rename community/immich/{1.1.1 => 2.0.0}/templates/NOTES.txt (100%) rename community/immich/{1.1.1 => 2.0.0}/templates/_configuration.tpl (84%) rename community/immich/{1.1.1 => 2.0.0}/templates/_immich-machinelearning.tpl (92%) rename community/immich/{1.1.1 => 2.0.0}/templates/_immich-microservices.tpl (94%) rename community/immich/{1.1.1 => 2.0.0}/templates/_immich-server.tpl (84%) rename community/immich/{1.1.1 => 2.0.0}/templates/_immich-typesense.tpl (92%) rename community/immich/{1.1.1 => 2.0.0}/templates/_persistence.tpl (74%) rename community/immich/{1.1.1 => 2.0.0}/templates/_portal.tpl (100%) rename community/immich/{1.1.1 => 2.0.0}/templates/_postgres.tpl (100%) rename community/immich/{1.1.1 => 2.0.0}/templates/_redis.tpl (100%) rename community/immich/{1.1.1 => 2.0.0}/templates/_service.tpl (76%) rename community/immich/{1.1.1 => 2.0.0}/templates/_waitURL.tpl (82%) rename community/immich/{1.1.1 => 2.0.0}/templates/common.yaml (86%) diff --git a/community/immich/1.1.1/templates/_immich-proxy.tpl b/community/immich/1.1.1/templates/_immich-proxy.tpl deleted file mode 100644 index 95feed8cd7..0000000000 --- a/community/immich/1.1.1/templates/_immich-proxy.tpl +++ /dev/null @@ -1,48 +0,0 @@ -{{- define "immich.proxy.workload" -}} -{{- $fullname := (include "ix.v1.common.lib.chart.names.fullname" $) -}} -{{- $serverUrl := printf "http://%v-server:%v/server-info/ping" $fullname .Values.immichNetwork.serverPort -}} -{{- $webUrl := printf "http://%v-web:%v/robots.txt" $fullname .Values.immichNetwork.webPort }} -workload: - proxy: - enabled: true - type: Deployment - podSpec: - hostNetwork: false - containers: - proxy: - enabled: true - primary: true - imageSelector: proxyImage - securityContext: - runAsUser: 0 - runAsGroup: 0 - runAsNonRoot: false - readOnlyRootFilesystem: false - capabilities: - add: - - CHOWN - - SETUID - - SETGID - envFrom: - - configMapRef: - name: proxy-config - probes: - liveness: - enabled: true - type: http - path: /api/server-info/ping - port: 8080 - readiness: - enabled: true - type: http - path: /api/server-info/ping - port: 8080 - startup: - enabled: true - type: http - path: /api/server-info/ping - port: 8080 - initContainers: - {{- include "immich.wait.init" (dict "url" $serverUrl) | indent 8 }} - {{- include "immich.wait.init" (dict "url" $webUrl) | indent 8 }} -{{- end -}} diff --git a/community/immich/1.1.1/templates/_immich-web.tpl b/community/immich/1.1.1/templates/_immich-web.tpl deleted file mode 100644 index a932895c32..0000000000 --- a/community/immich/1.1.1/templates/_immich-web.tpl +++ /dev/null @@ -1,45 +0,0 @@ -{{- define "immich.web.workload" -}} -{{- $fullname := (include "ix.v1.common.lib.chart.names.fullname" $) -}} -{{- $url := printf "http://%v-server:%v/server-info/ping" $fullname .Values.immichNetwork.serverPort }} -workload: - web: - enabled: true - type: Deployment - podSpec: - hostNetwork: false - containers: - web: - enabled: true - primary: true - imageSelector: webImage - securityContext: - runAsUser: 0 - runAsGroup: 0 - runAsNonRoot: false - readOnlyRootFilesystem: false - capabilities: - add: - - SETUID - - SETGID - envFrom: - - configMapRef: - name: web-config - probes: - liveness: - enabled: true - type: http - path: /robots.txt - port: {{ .Values.immichNetwork.webPort }} - readiness: - enabled: true - type: http - path: /robots.txt - port: {{ .Values.immichNetwork.webPort }} - startup: - enabled: true - type: http - path: /robots.txt - port: {{ .Values.immichNetwork.webPort }} - initContainers: - {{- include "immich.wait.init" (dict "url" $url) | indent 8 }} -{{- end -}} diff --git a/community/immich/1.1.1/Chart.lock b/community/immich/2.0.0/Chart.lock similarity index 100% rename from community/immich/1.1.1/Chart.lock rename to community/immich/2.0.0/Chart.lock diff --git a/community/immich/1.1.1/Chart.yaml b/community/immich/2.0.0/Chart.yaml similarity index 80% rename from community/immich/1.1.1/Chart.yaml rename to community/immich/2.0.0/Chart.yaml index 8f2971cfca..5cbf9e535c 100644 --- a/community/immich/1.1.1/Chart.yaml +++ b/community/immich/2.0.0/Chart.yaml @@ -1,11 +1,11 @@ name: immich -description: Immich +description: Immich is a self-hosted photo and video backup solution directly from your mobile phone. annotations: title: Immich type: application -version: 1.1.1 +version: 2.0.0 apiVersion: v2 -appVersion: 1.87.0 +appVersion: 1.88.1 kubeVersion: '>=1.16.0-0' maintainers: - name: truenas diff --git a/community/immich/1.1.1/README.md b/community/immich/2.0.0/README.md similarity index 100% rename from community/immich/1.1.1/README.md rename to community/immich/2.0.0/README.md diff --git a/community/immich/1.1.1/app-readme.md b/community/immich/2.0.0/app-readme.md similarity index 100% rename from community/immich/1.1.1/app-readme.md rename to community/immich/2.0.0/app-readme.md diff --git a/community/immich/1.1.1/charts/common-1.2.3.tgz b/community/immich/2.0.0/charts/common-1.2.3.tgz similarity index 100% rename from community/immich/1.1.1/charts/common-1.2.3.tgz rename to community/immich/2.0.0/charts/common-1.2.3.tgz diff --git a/community/immich/1.1.1/ci/basic-values.yaml b/community/immich/2.0.0/ci/basic-values.yaml similarity index 100% rename from community/immich/1.1.1/ci/basic-values.yaml rename to community/immich/2.0.0/ci/basic-values.yaml diff --git a/community/immich/1.1.1/ci/extra-values.yaml b/community/immich/2.0.0/ci/extra-values.yaml similarity index 100% rename from community/immich/1.1.1/ci/extra-values.yaml rename to community/immich/2.0.0/ci/extra-values.yaml diff --git a/community/immich/1.1.1/ci/no-extra-values.yaml b/community/immich/2.0.0/ci/no-extra-values.yaml similarity index 100% rename from community/immich/1.1.1/ci/no-extra-values.yaml rename to community/immich/2.0.0/ci/no-extra-values.yaml diff --git a/community/immich/1.1.1/ci/no-ml-values.yaml b/community/immich/2.0.0/ci/no-ml-values.yaml similarity index 100% rename from community/immich/1.1.1/ci/no-ml-values.yaml rename to community/immich/2.0.0/ci/no-ml-values.yaml diff --git a/community/immich/1.1.1/ci/no-typesenes-values.yaml b/community/immich/2.0.0/ci/no-typesenes-values.yaml similarity index 100% rename from community/immich/1.1.1/ci/no-typesenes-values.yaml rename to community/immich/2.0.0/ci/no-typesenes-values.yaml diff --git a/community/immich/1.1.1/ix_values.yaml b/community/immich/2.0.0/ix_values.yaml similarity index 87% rename from community/immich/1.1.1/ix_values.yaml rename to community/immich/2.0.0/ix_values.yaml index 87ce0077a9..dabc98632d 100644 --- a/community/immich/1.1.1/ix_values.yaml +++ b/community/immich/2.0.0/ix_values.yaml @@ -1,22 +1,12 @@ image: repository: altran1502/immich-server pullPolicy: IfNotPresent - tag: v1.87.0 - -webImage: - repository: altran1502/immich-web - pullPolicy: IfNotPresent - tag: v1.87.0 - -proxyImage: - repository: altran1502/immich-proxy - pullPolicy: IfNotPresent - tag: v1.87.0 + tag: v1.88.1 mlImage: repository: altran1502/immich-machine-learning pullPolicy: IfNotPresent - tag: v1.87.0 + tag: v1.88.1 typesenseImage: repository: typesense/typesense @@ -40,8 +30,6 @@ immichNetwork: # Not user configurable, will be hidden on UI # Putting it here in case it needs to be configurable # in the future. - serverPort: 32000 - webPort: 32001 machinelearningPort: 32002 microservicesPort: 32003 typesensePort: 32004 diff --git a/community/immich/1.1.1/metadata.yaml b/community/immich/2.0.0/metadata.yaml similarity index 100% rename from community/immich/1.1.1/metadata.yaml rename to community/immich/2.0.0/metadata.yaml diff --git a/community/immich/1.1.1/migrations/migrate b/community/immich/2.0.0/migrations/migrate similarity index 100% rename from community/immich/1.1.1/migrations/migrate rename to community/immich/2.0.0/migrations/migrate diff --git a/community/immich/1.1.1/questions.yaml b/community/immich/2.0.0/questions.yaml similarity index 99% rename from community/immich/1.1.1/questions.yaml rename to community/immich/2.0.0/questions.yaml index 38c0f2b50a..5137eeb7bf 100644 --- a/community/immich/1.1.1/questions.yaml +++ b/community/immich/2.0.0/questions.yaml @@ -156,6 +156,7 @@ questions: schema: type: hostpath show_if: [["aclEnable", "=", false]] + immutable: true required: true - variable: library label: Immich Library Storage @@ -234,6 +235,7 @@ questions: schema: type: hostpath show_if: [["aclEnable", "=", false]] + immutable: true required: true - variable: thumbs label: Immich Thumbs Storage @@ -312,6 +314,7 @@ questions: schema: type: hostpath show_if: [["aclEnable", "=", false]] + immutable: true required: true - variable: profile label: Immich Profile Storage @@ -390,6 +393,7 @@ questions: schema: type: hostpath show_if: [["aclEnable", "=", false]] + immutable: true required: true - variable: video label: Immich Video Storage @@ -468,6 +472,7 @@ questions: schema: type: hostpath show_if: [["aclEnable", "=", false]] + immutable: true required: true - variable: pgData @@ -555,6 +560,7 @@ questions: schema: type: hostpath show_if: [["aclEnable", "=", false]] + immutable: true required: true - variable: pgBackup @@ -642,6 +648,7 @@ questions: schema: type: hostpath show_if: [["aclEnable", "=", false]] + immutable: true required: true - variable: additionalStorages @@ -712,6 +719,7 @@ questions: schema: type: hostpath show_if: [["aclEnable", "=", false]] + immutable: true required: true - variable: ixVolumeConfig label: ixVolume Configuration diff --git a/community/immich/1.1.1/templates/NOTES.txt b/community/immich/2.0.0/templates/NOTES.txt similarity index 100% rename from community/immich/1.1.1/templates/NOTES.txt rename to community/immich/2.0.0/templates/NOTES.txt diff --git a/community/immich/1.1.1/templates/_configuration.tpl b/community/immich/2.0.0/templates/_configuration.tpl similarity index 84% rename from community/immich/1.1.1/templates/_configuration.tpl rename to community/immich/2.0.0/templates/_configuration.tpl index 8dac89603e..941b9de771 100644 --- a/community/immich/1.1.1/templates/_configuration.tpl +++ b/community/immich/2.0.0/templates/_configuration.tpl @@ -87,7 +87,10 @@ configmap: data: LOG_LEVEL: log NODE_ENV: production - SERVER_PORT: {{ .Values.immichNetwork.serverPort | quote }} + SERVER_PORT: {{ .Values.immichNetwork.webuiPort | quote }} + {{- with .Values.immichConfig.publicLoginMessage }} + PUBLIC_LOGIN_PAGE_MESSAGE: {{ . | quote }} + {{- end }} micro-config: enabled: true @@ -97,23 +100,6 @@ configmap: MICROSERVICES_PORT: {{ .Values.immichNetwork.microservicesPort | quote }} REVERSE_GEOCODING_DUMP_DIRECTORY: /microcache - web-config: - enabled: true - data: - NODE_ENV: production - PORT: {{ .Values.immichNetwork.webPort | quote }} - IMMICH_SERVER_URL: {{ printf "http://%v-server:%v" $fullname .Values.immichNetwork.serverPort }} - PUBLIC_IMMICH_SERVER_URL: {{ printf "http://%v-server:%v" $fullname .Values.immichNetwork.serverPort }} - {{- with .Values.immichConfig.publicLoginMessage }} - PUBLIC_LOGIN_PAGE_MESSAGE: {{ . | quote }} - {{- end }} - - proxy-config: - enabled: true - data: - IMMICH_WEB_URL: {{ printf "http://%v-web:%v" $fullname .Values.immichNetwork.webPort }} - IMMICH_SERVER_URL: {{ printf "http://%v-server:%v" $fullname .Values.immichNetwork.serverPort }} - {{- if .Values.immichConfig.enableML }} ml-config: enabled: true diff --git a/community/immich/1.1.1/templates/_immich-machinelearning.tpl b/community/immich/2.0.0/templates/_immich-machinelearning.tpl similarity index 92% rename from community/immich/1.1.1/templates/_immich-machinelearning.tpl rename to community/immich/2.0.0/templates/_immich-machinelearning.tpl index 1f6479b9be..0466f36588 100644 --- a/community/immich/1.1.1/templates/_immich-machinelearning.tpl +++ b/community/immich/2.0.0/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.serverPort }} +{{- $url := printf "http://%v:%v/api/server-info/ping" $fullname .Values.immichNetwork.webuiPort }} workload: machinelearning: enabled: true diff --git a/community/immich/1.1.1/templates/_immich-microservices.tpl b/community/immich/2.0.0/templates/_immich-microservices.tpl similarity index 94% rename from community/immich/1.1.1/templates/_immich-microservices.tpl rename to community/immich/2.0.0/templates/_immich-microservices.tpl index 4a351f0f97..fe437d63dc 100644 --- a/community/immich/1.1.1/templates/_immich-microservices.tpl +++ b/community/immich/2.0.0/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.serverPort }} +{{- $url := printf "http://%v:%v/api/server-info/ping" $fullname .Values.immichNetwork.webuiPort }} workload: microservices: enabled: true diff --git a/community/immich/1.1.1/templates/_immich-server.tpl b/community/immich/2.0.0/templates/_immich-server.tpl similarity index 84% rename from community/immich/1.1.1/templates/_immich-server.tpl rename to community/immich/2.0.0/templates/_immich-server.tpl index 5650656243..288d2870e8 100644 --- a/community/immich/1.1.1/templates/_immich-server.tpl +++ b/community/immich/2.0.0/templates/_immich-server.tpl @@ -31,18 +31,18 @@ workload: liveness: enabled: true type: http - path: /server-info/ping - port: {{ .Values.immichNetwork.serverPort }} + path: /api/server-info/ping + port: {{ .Values.immichNetwork.webuiPort }} readiness: enabled: true type: http - path: /server-info/ping - port: {{ .Values.immichNetwork.serverPort }} + path: /api/server-info/ping + port: {{ .Values.immichNetwork.webuiPort }} startup: enabled: true type: http - path: /server-info/ping - port: {{ .Values.immichNetwork.serverPort }} + path: /api/server-info/ping + port: {{ .Values.immichNetwork.webuiPort }} initContainers: {{- include "ix.v1.common.app.postgresWait" (dict "name" "postgres-wait" "secretName" "postgres-creds") | nindent 8 }} diff --git a/community/immich/1.1.1/templates/_immich-typesense.tpl b/community/immich/2.0.0/templates/_immich-typesense.tpl similarity index 92% rename from community/immich/1.1.1/templates/_immich-typesense.tpl rename to community/immich/2.0.0/templates/_immich-typesense.tpl index 53dd8958a4..46fabdee79 100644 --- a/community/immich/1.1.1/templates/_immich-typesense.tpl +++ b/community/immich/2.0.0/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.serverPort }} +{{- $url := printf "http://%v:%v/api/server-info/ping" $fullname .Values.immichNetwork.webuiPort }} workload: typesense: enabled: true diff --git a/community/immich/1.1.1/templates/_persistence.tpl b/community/immich/2.0.0/templates/_persistence.tpl similarity index 74% rename from community/immich/1.1.1/templates/_persistence.tpl rename to community/immich/2.0.0/templates/_persistence.tpl index 6ba08c8474..b16d12e86e 100644 --- a/community/immich/1.1.1/templates/_persistence.tpl +++ b/community/immich/2.0.0/templates/_persistence.tpl @@ -1,12 +1,4 @@ {{- define "immich.persistence" -}} - {{- include "immich.storage.ci.migration" (dict "storage" .Values.immichStorage.pgData) }} - {{- include "immich.storage.ci.migration" (dict "storage" .Values.immichStorage.pgBackup) }} - {{- include "immich.storage.ci.migration" (dict "storage" .Values.immichStorage.library) }} - {{- include "immich.storage.ci.migration" (dict "storage" .Values.immichStorage.uploads) }} - {{- include "immich.storage.ci.migration" (dict "storage" .Values.immichStorage.thumbs) }} - {{- include "immich.storage.ci.migration" (dict "storage" .Values.immichStorage.profile) }} - {{- include "immich.storage.ci.migration" (dict "storage" .Values.immichStorage.video) }} - persistence: {{/* Data */}} library: @@ -62,7 +54,6 @@ persistence: {{- range $idx, $storage := .Values.immichStorage.additionalStorages }} {{ printf "immich-%v:" (int $idx) }} enabled: true - {{- include "immich.storage.ci.migration" (dict "storage" $storage) }} {{- include "ix.v1.common.app.storageOptions" (dict "storage" $storage) | nindent 4 }} targetSelector: server: @@ -120,13 +111,3 @@ persistence: "pgBackup" .Values.immichStorage.pgBackup ) | nindent 2 }} {{- end -}} - -{{/* Can be removed on the next bump (1.1.0+), only used for CI values */}} -{{- define "immich.storage.ci.migration" -}} - {{- $storage := .storage -}} - - {{- if $storage.hostPath -}} - {{- $_ := set $storage "hostPathConfig" dict -}} - {{- $_ := set $storage.hostPathConfig "hostPath" $storage.hostPath -}} - {{- end -}} -{{- end -}} diff --git a/community/immich/1.1.1/templates/_portal.tpl b/community/immich/2.0.0/templates/_portal.tpl similarity index 100% rename from community/immich/1.1.1/templates/_portal.tpl rename to community/immich/2.0.0/templates/_portal.tpl diff --git a/community/immich/1.1.1/templates/_postgres.tpl b/community/immich/2.0.0/templates/_postgres.tpl similarity index 100% rename from community/immich/1.1.1/templates/_postgres.tpl rename to community/immich/2.0.0/templates/_postgres.tpl diff --git a/community/immich/1.1.1/templates/_redis.tpl b/community/immich/2.0.0/templates/_redis.tpl similarity index 100% rename from community/immich/1.1.1/templates/_redis.tpl rename to community/immich/2.0.0/templates/_redis.tpl diff --git a/community/immich/1.1.1/templates/_service.tpl b/community/immich/2.0.0/templates/_service.tpl similarity index 76% rename from community/immich/1.1.1/templates/_service.tpl rename to community/immich/2.0.0/templates/_service.tpl index bc1f83a5cf..452067dbc1 100644 --- a/community/immich/1.1.1/templates/_service.tpl +++ b/community/immich/2.0.0/templates/_service.tpl @@ -1,44 +1,19 @@ {{- define "immich.service" -}} service: - proxy: + server: enabled: true primary: true type: NodePort - targetSelector: proxy - ports: - proxy: - enabled: true - primary: true - port: {{ .Values.immichNetwork.webuiPort }} - nodePort: {{ .Values.immichNetwork.webuiPort }} - protocol: http - targetPort: 8080 - targetSelector: proxy - - server: - enabled: true - type: ClusterIP targetSelector: server ports: server: enabled: true primary: true - port: {{ .Values.immichNetwork.serverPort }} + port: {{ .Values.immichNetwork.webuiPort }} + nodePort: {{ .Values.immichNetwork.webuiPort }} protocol: http targetSelector: server - web: - enabled: true - type: ClusterIP - targetSelector: web - ports: - web: - enabled: true - primary: true - port: {{ .Values.immichNetwork.webPort }} - protocol: http - targetSelector: web - microservices: enabled: true type: ClusterIP diff --git a/community/immich/1.1.1/templates/_waitURL.tpl b/community/immich/2.0.0/templates/_waitURL.tpl similarity index 82% rename from community/immich/1.1.1/templates/_waitURL.tpl rename to community/immich/2.0.0/templates/_waitURL.tpl index 7c109c0000..cdacbb988f 100644 --- a/community/immich/1.1.1/templates/_waitURL.tpl +++ b/community/immich/2.0.0/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 diff --git a/community/immich/1.1.1/templates/common.yaml b/community/immich/2.0.0/templates/common.yaml similarity index 86% rename from community/immich/1.1.1/templates/common.yaml rename to community/immich/2.0.0/templates/common.yaml index 3a4b911709..bb30b02fad 100644 --- a/community/immich/1.1.1/templates/common.yaml +++ b/community/immich/2.0.0/templates/common.yaml @@ -7,8 +7,6 @@ {{- if .Values.immichConfig.enableML -}} {{- $_ := mustMergeOverwrite .Values (include "immich.machinelearning.workload" $ | fromYaml) -}} {{- end -}} -{{- $_ := mustMergeOverwrite .Values (include "immich.web.workload" $ | fromYaml) -}} -{{- $_ := mustMergeOverwrite .Values (include "immich.proxy.workload" $ | fromYaml) -}} {{- if .Values.immichConfig.enableTypesense -}} {{- $_ := mustMergeOverwrite .Values (include "immich.typesense.workload" $ | fromYaml) -}} {{- end -}}