fix(immich): use correctly nested controllers structure for affinity and 4Gi resources

1 files changed, 70 insertions, 60 deletions

diff --git a/f3s/argocd-apps/services/immich.yaml b/f3s/argocd-apps/services/immich.yaml
index fa65cde..39d94b7 100644
--- a/f3s/argocd-apps/services/immich.yaml
+++ b/f3s/argocd-apps/services/immich.yaml
@@ -32,27 +32,78 @@ spec:
             persistence:
               library:
                 existingClaim: "immich-library-pvc"
+          controllers:
+            server:
+              strategy: RollingUpdate
+              containers:
+                main:
+                  image:
+                    tag: v2.5.5
+                  resources:
+                    requests:
+                      cpu: 500m
+                      memory: 512Mi
+                    limits:
+                      memory: 4Gi
+              pod:
+                affinity:
+                  podAntiAffinity:
+                    preferredDuringSchedulingIgnoredDuringExecution:
+                      - weight: 100
+                        podAffinityTerm:
+                          labelSelector:
+                            matchExpressions:
+                              - key: app.kubernetes.io/name
+                                operator: In
+                                values:
+                                  - machine-learning
+                          topologyKey: "kubernetes.io/hostname"
+            machine-learning:
+              strategy: RollingUpdate
+              containers:
+                main:
+                  image:
+                    tag: v2.5.5
+                  resources:
+                    requests:
+                      cpu: 500m
+                      memory: 512Mi
+                    limits:
+                      memory: 4Gi
+              pod:
+                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"
+            main:
+              containers:
+                main:
+                  env:
+                    DB_HOSTNAME: immich-postgres
+                    DB_DATABASE_NAME: immich
+                    DB_USERNAME: immich
+                    DB_PASSWORD:
+                      valueFrom:
+                        secretKeyRef:
+                          name: immich-db-secret
+                          key: password
           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
@@ -93,47 +144,6 @@ spec:
                         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"
-          controllers:
-            main:
-              containers:
-                main:
-                  env:
-                    DB_HOSTNAME: immich-postgres
-                    DB_DATABASE_NAME: immich
-                    DB_USERNAME: immich
-                    DB_PASSWORD:
-                      valueFrom:
-                        secretKeyRef:
-                          name: immich-db-secret
-                          key: password
   destination:
     server: https://kubernetes.default.svc
     namespace: services