chore(immich): cleanup and fix gpu allocation

truecharts · Mar 23, 2024 · 72b05b2 · 72b05b2
1 parent e06cb2a
commit 72b05b2
Show file tree

Hide file tree

Showing 8 changed files with 51 additions and 65 deletions.
diff --git a/charts/stable/immich/Chart.yaml b/charts/stable/immich/Chart.yaml
@@ -41,4 +41,4 @@ sources:
   - https://hub.docker.com/r/altran1502/immich-machine-learning
   - https://hub.docker.com/r/altran1502/immich-server
 type: application
-version: 14.2.0
+version: 14.2.1
diff --git a/charts/stable/immich/questions.yaml b/charts/stable/immich/questions.yaml
@@ -3,15 +3,15 @@ portals:
   open:
 # Include{portalLink}
 questions:
-# Include{global}
-# Include{workload}
-# Include{workloadDeployment}
+  # Include{global}
+  # Include{workload}
+  # Include{workloadDeployment}
 
-# Include{replicas1}
-# Include{podSpec}
-# Include{containerMain}
-# Include{containerBasic}
-# Include{containerAdvanced}
+  # Include{replicas1}
+  # Include{podSpec}
+  # Include{containerMain}
+  # Include{containerBasic}
+  # Include{containerAdvanced}
 
   - variable: immich
     group: App Configuration
@@ -20,12 +20,6 @@ questions:
       additional_attrs: true
       type: dict
       attrs:
-        - variable: public_login_page_message
-          label: Public Login Page Message
-          description: Custom message on the login page, should be written in HTML form.
-          schema:
-            type: string
-            default: ""
         - variable: log_level
           label: Log Level
           schema:
@@ -56,89 +50,89 @@ questions:
             type: boolean
             default: true
 
-# Include{containerConfig}
-# Include{podOptions}
-# Include{serviceRoot}
+        # Include{containerConfig}
+        # Include{podOptions}
+        # Include{serviceRoot}
         - variable: main
           label: Main Service
           description: The Primary service on which the healthcheck runs, often the webUI
           schema:
             additional_attrs: true
             type: dict
             attrs:
-# Include{serviceSelectorLoadBalancer}
-# Include{serviceSelectorExtras}
-                    - variable: main
-                      label: Main Service Port Configuration
+              # Include{serviceSelectorLoadBalancer}
+              # Include{serviceSelectorExtras}
+              - variable: main
+                label: Main Service Port Configuration
+                schema:
+                  additional_attrs: true
+                  type: dict
+                  attrs:
+                    - variable: port
+                      label: Port
+                      description: This port exposes the container port on the service
                       schema:
-                        additional_attrs: true
-                        type: dict
-                        attrs:
-                          - variable: port
-                            label: Port
-                            description: This port exposes the container port on the service
-                            schema:
-                              type: int
-                              default: 10323
-                              required: true
-# Include{serviceExpertRoot}
-# Include{serviceExpert}
-# Include{serviceList}
-# Include{persistenceRoot}
+                        type: int
+                        default: 10323
+                        required: true
+        # Include{serviceExpertRoot}
+        # Include{serviceExpert}
+        # Include{serviceList}
+        # Include{persistenceRoot}
         - variable: library
           label: App Library Storage
           description: Stores the Application Uploads.
           schema:
             additional_attrs: true
             type: dict
             attrs:
-# Include{persistenceBasic}
+        # Include{persistenceBasic}
         - variable: uploads
           label: App Uploads Storage
           description: Temporary location for WebUI and mobile app uploads for images/videos that still need to be processed and eventually imported into the library storage.
           schema:
             additional_attrs: true
             type: dict
             attrs:
-# Include{persistenceBasic}
+        # Include{persistenceBasic}
         - variable: thumbs
           label: App Thumbnails Storage
           description: Stores the Application Thumbnails.
           schema:
             additional_attrs: true
             type: dict
             attrs:
-# Include{persistenceBasic}
+        # Include{persistenceBasic}
         - variable: profile
           label: App Profiles Storage
           description: Stores the Application Profiles.
           schema:
             additional_attrs: true
             type: dict
             attrs:
-# Include{persistenceBasic}
+        # Include{persistenceBasic}
         - variable: video
           label: App Encoded Video Storage
           description: Stores the Encoded Videos.
           schema:
             additional_attrs: true
             type: dict
             attrs:
-# Include{persistenceBasic}
-# Include{persistenceList}
-# Include{ingressRoot}
+        # Include{persistenceBasic}
+        # Include{persistenceList}
+        # Include{ingressRoot}
         - variable: main
           label: Main Ingress
           schema:
             additional_attrs: true
             type: dict
             attrs:
-# Include{ingressDefault}
-# Include{ingressTLS}
-# Include{ingressTraefik}
-# Include{ingressAdvanced}
-# Include{ingressList}
-# Include{securityContextRoot}
+              # Include{ingressDefault}
+              # Include{ingressTLS}
+              # Include{ingressTraefik}
+              # Include{ingressAdvanced}
+              # Include{ingressList}
+              # Include{securityContextRoot}
               - variable: runAsUser
                 label: "runAsUser"
                 description: "The UserID of the user running the application"
@@ -151,16 +145,15 @@ questions:
                 schema:
                   type: int
                   default: 0
-# Include{securityContextContainer}
-# Include{securityContextAdvanced}
-# Include{securityContextPod}
+              # Include{securityContextContainer}
+              # Include{securityContextAdvanced}
+              # Include{securityContextPod}
               - variable: fsGroup
                 label: "fsGroup"
                 description: "The group that should own ALL storage."
                 schema:
                   type: int
                   default: 568
-
 # Include{resources}
 # Include{postgresql}
 # Include{advanced}

diff --git a/charts/stable/immich/templates/_config.tpl b/charts/stable/immich/templates/_config.tpl
@@ -6,9 +6,6 @@ configmap:
     enabled: true
     data:
       SERVER_PORT: {{ .Values.service.main.ports.main.port | quote }}
-      {{- with .Values.immich.public_login_page_message }}
-      PUBLIC_LOGIN_PAGE_MESSAGE: {{ . }}
-      {{- end }}
 
   micro-config:
     enabled: true

diff --git a/charts/stable/immich/templates/_machinelearning.tpl b/charts/stable/immich/templates/_machinelearning.tpl
@@ -17,7 +17,7 @@ podSpec:
     machinelearning:
       enabled: true
       primary: true
-      imageSelector: "{{ $img }}"
+      imageSelector: {{ $img }}
       securityContext:
         capabilities:
           disableS6Caps: true

diff --git a/charts/stable/immich/templates/_server.tpl b/charts/stable/immich/templates/_server.tpl
@@ -2,6 +2,8 @@
 enabled: true
 primary: true
 imageSelector: image
+resources:
+  excludeExtra: true
 command: /bin/sh
 args:
   - -c

diff --git a/charts/stable/immich/templates/_wait.tpl b/charts/stable/immich/templates/_wait.tpl
@@ -3,6 +3,8 @@
 enabled: true
 type: init
 imageSelector: alpineImage
+resources:
+  excludeExtra: true
 command:
   - /bin/ash
   - -c

diff --git a/charts/stable/immich/templates/common.yaml b/charts/stable/immich/templates/common.yaml
@@ -18,13 +18,6 @@
   {{- $_ := set .Values.service.machinelearning "enabled" false -}}
 {{- end -}}
 
-{{/* Set targetselector for GPU to microservices */}}
-{{- range $gpuEntry := .Values.scaleGPU }}
-  {{- if $gpuEntry.gpu -}}
-    {{- $_ := set $gpuEntry "targetSelector" (dict "microservices" (list "microservices")) -}}
-  {{- end -}}
-{{- end -}}
-
 {{/* Render configuration for immich
     after services, as it has references
 */}}

diff --git a/charts/stable/immich/values.yaml b/charts/stable/immich/values.yaml
@@ -28,7 +28,6 @@ securityContext:
 immich:
   enable_ml: true
   mlImageType: mlImage
-  public_login_page_message: Immich
   log_level: log
 
 service: