fix(immich): use dual-style values for resources and affinity to ensure they apply

1 files changed, 92 insertions, 57 deletions

diff --git a/f3s/immich/values.yaml b/f3s/immich/values.yaml
index 8bcc8cf..14939a9 100644
--- a/f3s/immich/values.yaml
+++ b/f3s/immich/values.yaml
@@ -19,10 +19,100 @@ immich:
     library:
       existingClaim: "immich-library-pvc"
 
-# Main components using bjw-s common library structure (controllers key)
+# Main components configuration (Both old and new style for safety)
+server:
+  enabled: true
+  resources:
+    requests:
+      cpu: 500m
+      memory: 512Mi
+    limits:
+      memory: 4Gi
+  affinity:
+    podAntiAffinity:
+      preferredDuringSchedulingIgnoredDuringExecution:
+        - weight: 100
+          podAffinityTerm:
+            labelSelector:
+              matchExpressions:
+                - key: app.kubernetes.io/name
+                  operator: In
+                  values:
+                    - machine-learning
+            topologyKey: "kubernetes.io/hostname"
+  persistence:
+    ext-albena-rw:
+      enabled: true
+      type: persistentVolumeClaim
+      existingClaim: immich-ext-albena-pvc
+      globalMounts:
+        - path: /external-albena-rw
+    ext-paul-rw:
+      enabled: true
+      type: persistentVolumeClaim
+      existingClaim: immich-ext-paul-pvc
+      globalMounts:
+        - path: /external-paul-rw
+    ext-videos-rw:
+      enabled: true
+      type: persistentVolumeClaim
+      existingClaim: immich-ext-videos-rw-pvc
+      globalMounts:
+        - path: /external-videos-rw
+    ext-videos-ro:
+      enabled: true
+      type: persistentVolumeClaim
+      existingClaim: immich-ext-videos-ro-pvc
+      globalMounts:
+        - path: /external-videos-ro
+          readOnly: true
+  ingress:
+    main:
+      enabled: true
+      annotations:
+        spec.ingressClassName: traefik
+        traefik.ingress.kubernetes.io/router.entrypoints: web
+        # Remove body size limit for file uploads
+        traefik.ingress.kubernetes.io/router.middlewares: services-immich-body-size@kubernetescrd
+      hosts:
+        - host: immich.f3s.buetow.org
+          paths:
+            - path: "/"
+              service:
+                identifier: main
+                port: 2283
+
+machine-learning:
+  enabled: true
+  resources:
+    requests:
+      cpu: 500m
+      memory: 512Mi
+    limits:
+      memory: 4Gi
+  affinity:
+    podAntiAffinity:
+      preferredDuringSchedulingIgnoredDuringExecution:
+        - weight: 100
+          podAffinityTerm:
+            labelSelector:
+              matchExpressions:
+                - key: app.kubernetes.io/name
+                  operator: In
+                  values:
+                    - server
+            topologyKey: "kubernetes.io/hostname"
+  persistence:
+    cache:
+      enabled: true
+      type: persistentVolumeClaim
+      size: 10Gi
+      storageClass: ""
+      existingClaim: "immich-ml-cache-pvc"
+
+# Structured controllers key for newer common library versions
 controllers:
   server:
-    strategy: RollingUpdate
     containers:
       main:
         resources:
@@ -44,9 +134,7 @@ controllers:
                       values:
                         - machine-learning
                 topologyKey: "kubernetes.io/hostname"
-
   machine-learning:
-    strategy: RollingUpdate
     containers:
       main:
         resources:
@@ -68,14 +156,6 @@ controllers:
                       values:
                         - server
                 topologyKey: "kubernetes.io/hostname"
-    persistence:
-      cache:
-        enabled: true
-        type: persistentVolumeClaim
-        size: 10Gi
-        storageClass: ""
-        existingClaim: "immich-ml-cache-pvc"
-
   main:
     containers:
       main:
@@ -88,48 +168,3 @@ controllers:
               secretKeyRef:
                 name: immich-db-secret
                 key: password
-
-# Ingress and In-line components
-server:
-  enabled: true
-  persistence:
-    ext-albena-rw:
-      enabled: true
-      type: persistentVolumeClaim
-      existingClaim: immich-ext-albena-pvc
-      globalMounts:
-        - path: /external-albena-rw
-    ext-paul-rw:
-      enabled: true
-      type: persistentVolumeClaim
-      existingClaim: immich-ext-paul-pvc
-      globalMounts:
-        - path: /external-paul-rw
-    ext-videos-rw:
-      enabled: true
-      type: persistentVolumeClaim
-      existingClaim: immich-ext-videos-rw-pvc
-      globalMounts:
-        - path: /external-videos-rw
-    ext-videos-ro:
-      enabled: true
-      type: persistentVolumeClaim
-      existingClaim: immich-ext-videos-ro-pvc
-      globalMounts:
-        - path: /external-videos-ro
-          readOnly: true
-  ingress:
-    main:
-      enabled: true
-      annotations:
-        spec.ingressClassName: traefik
-        traefik.ingress.kubernetes.io/router.entrypoints: web
-        # Remove body size limit for file uploads
-        traefik.ingress.kubernetes.io/router.middlewares: services-immich-body-size@kubernetescrd
-      hosts:
-        - host: immich.f3s.buetow.org
-          paths:
-            - path: "/"
-              service:
-                identifier: main
-                port: 2283