feat(apps/mealie): upgrade app-template to v2.4.0

qlonik · Jan 3, 2024 · 6a061bc · 6a061bc
1 parent 983caec
commit 6a061bc
Show file tree

Hide file tree

Showing 4 changed files with 174 additions and 151 deletions.
diff --git a/kubernetes/apps/default/mealie/api/helmrelease.yaml b/kubernetes/apps/default/mealie/api/helmrelease.yaml
@@ -1,4 +1,5 @@
 ---
+# yaml-language-server: $schema=https://raw.githubusercontent.com/fluxcd-community/flux2-schemas/main/helmrelease-helm-v2beta2.json
 apiVersion: helm.toolkit.fluxcd.io/v2beta2
 kind: HelmRelease
 metadata:
@@ -9,7 +10,7 @@ spec:
   chart:
     spec:
       chart: app-template
-      version: 1.5.1
+      version: 2.4.0
       sourceRef:
         kind: HelmRepository
         name: bjw-s
@@ -28,97 +29,102 @@ spec:
     - name: openldap
       namespace: default
   values:
-    controller:
-      annotations:
-        reloader.stakater.com/auto: "true"
-    image:
-      repository: docker.io/hkotel/mealie
-      tag: api-nightly@sha256:0d80361802f1cde457d222a662c045ddf283d8e926558dbcd02d923d99d2cd92
-    env:
-      TZ: "${TIMEZONE}"
-      PUID: 568
-      PGID: 568
+    controllers:
+      main:
+        annotations:
+          reloader.stakater.com/auto: "true"
+        containers:
+          main:
+            image:
+              repository: docker.io/hkotel/mealie
+              tag: api-nightly@sha256:0d80361802f1cde457d222a662c045ddf283d8e926558dbcd02d923d99d2cd92
+            env:
+              TZ: "${TIMEZONE}"
+              PUID: 568
+              PGID: 568
 
-      ALLOW_SIGNUP: "false"
-      API_PORT: &port 9000
-      AUTO_BACKUP_ENABLED: "true"
-      BASE_URL: "https://recipes.${SECRET_DOMAIN}"
-      DEFAULT_EMAIL: "admin@${SECRET_DOMAIN}"
-      TOKEN_TIME: 720
+              ALLOW_SIGNUP: "false"
+              API_PORT: &port 9000
+              AUTO_BACKUP_ENABLED: "true"
+              BASE_URL: "https://recipes.${SECRET_DOMAIN}"
+              DEFAULT_EMAIL: "admin@${SECRET_DOMAIN}"
+              TOKEN_TIME: 720
 
-      DB_ENGINE: postgres
-      POSTGRES_SERVER: postgres-rw.default.svc.cluster.local
-      POSTGRES_PORT: 5432
+              DB_ENGINE: postgres
+              POSTGRES_SERVER: postgres-rw.default.svc.cluster.local
+              POSTGRES_PORT: 5432
 
-      SMTP_HOST: smtp-relay.default.svc.cluster.local
-      SMTP_PORT: 2525
-      SMTP_FROM_NAME: Mealie
-      SMTP_FROM_EMAIL: "mealie@${SECRET_DOMAIN}"
-      SMTP_AUTH_STRATEGY: NONE
+              SMTP_HOST: smtp-relay.default.svc.cluster.local
+              SMTP_PORT: 2525
+              SMTP_FROM_NAME: Mealie
+              SMTP_FROM_EMAIL: "mealie@${SECRET_DOMAIN}"
+              SMTP_AUTH_STRATEGY: NONE
 
-      LDAP_AUTH_ENABLED: "true"
-      LDAP_SERVER_URL: ldap://openldap.default.svc.cluster.local:389
-      LDAP_TLS_INSECURE: "false"
-      LDAP_TLS_CACERTFILE: ""
-      LDAP_ENABLE_STARTTLS: "false"
-      LDAP_BASE_DN: dc=home,dc=arpa
-      LDAP_QUERY_BIND: cn=admin,dc=home,dc=arpa
-      LDAP_QUERY_PASSWORD:
-        valueFrom:
-          secretKeyRef:
-            name: openldap-credentials
-            key: LDAP_ADMIN_PASSWORD
-      LDAP_USER_FILTER: "(memberOf=cn=user,ou=groups,dc=home,dc=arpa)(objectClass=inetOrgPerson)"
-      LDAP_ADMIN_FILTER: "(&(memberOf=cn=admin,ou=groups,dc=home,dc=arpa)(objectClass=inetOrgPerson))"
-      LDAP_ID_ATTRIBUTE: uid
-      LDAP_NAME_ATTRIBUTE: uid
-      LDAP_MAIL_ATTRIBUTE: mail
-    envFrom:
-      - secretRef:
-          name: mealie-secret
+              LDAP_AUTH_ENABLED: "true"
+              LDAP_SERVER_URL: ldap://openldap.default.svc.cluster.local:389
+              LDAP_TLS_INSECURE: "false"
+              LDAP_TLS_CACERTFILE: ""
+              LDAP_ENABLE_STARTTLS: "false"
+              LDAP_BASE_DN: dc=home,dc=arpa
+              LDAP_QUERY_BIND: cn=admin,dc=home,dc=arpa
+              LDAP_QUERY_PASSWORD:
+                valueFrom:
+                  secretKeyRef:
+                    name: openldap-credentials
+                    key: LDAP_ADMIN_PASSWORD
+              LDAP_USER_FILTER: "(memberOf=cn=user,ou=groups,dc=home,dc=arpa)(objectClass=inetOrgPerson)"
+              LDAP_ADMIN_FILTER: "(&(memberOf=cn=admin,ou=groups,dc=home,dc=arpa)(objectClass=inetOrgPerson))"
+              LDAP_ID_ATTRIBUTE: uid
+              LDAP_NAME_ATTRIBUTE: uid
+              LDAP_MAIL_ATTRIBUTE: mail
+            envFrom:
+              - secretRef:
+                  name: mealie-secret
+            probes:
+              liveness: &probes
+                enabled: true
+                custom: true
+                spec:
+                  httpGet:
+                    path: /api/app/about
+                    port: *port
+                  initialDelaySeconds: 0
+                  periodSeconds: 10
+                  timeoutSeconds: 1
+                  failureThreshold: 3
+              readiness: *probes
+              startup:
+                enabled: false
+            resources:
+              requests:
+                cpu: 10m
+                memory: 200Mi
+              limits:
+                memory: 1000Mi
+            securityContext:
+              fsGroup: 568
+              fsGroupChangePolicy: "OnRootMismatch"
     service:
       main:
         ports:
           http:
             port: *port
-    probes:
-      liveness: &probes
-        enabled: true
-        custom: true
-        spec:
-          httpGet:
-            path: /api/app/about
-            port: *port
-          initialDelaySeconds: 0
-          periodSeconds: 10
-          timeoutSeconds: 1
-          failureThreshold: 3
-      readiness: *probes
-      startup:
-        enabled: false
-    podSecurityContext:
-      fsGroup: 568
-      fsGroupChangePolicy: "OnRootMismatch"
     persistence:
       data:
         enabled: true
-        type: pvc
+        type: persistentVolumeClaim
         storageClass: nfs-fast
         accessMode: ReadWriteMany
         size: 2Gi
         retain: true
-        mountPath: /app/data
+        globalMounts:
+          - path: /app/data
       backups:
         enabled: true
-        type: pvc
+        type: persistentVolumeClaim
         storageClass: nfs-slow
         accessMode: ReadWriteMany
         size: 10Gi
         retain: true
-        mountPath: /app/data/backups
-    resources:
-      requests:
-        cpu: 10m
-        memory: 200Mi
-      limits:
-        memory: 1000Mi
+        globalMounts:
+          - path: /app/data/backups
diff --git a/kubernetes/apps/default/mealie/api/patches/minio-init-bucket.yaml b/kubernetes/apps/default/mealie/api/patches/minio-init-bucket.yaml
@@ -6,28 +6,32 @@ metadata:
   namespace: default
 spec:
   values:
-    initContainers:
-      minio-init-bucket:
-        image: ghcr.io/qlonik/minio-init-bucket:RELEASE.2023-04-12T02-21-51Z@sha256:4ce4b3e62f4a1922bbcb9cfbcac529d42ba1702a0914fbdcd79a3bb00425ee2c
-        env:
-          MINIO_HOST: http://minio.default.svc.cluster.local:9000
-          MINIO_SUPER_ACCESS_KEY:
-            valueFrom:
-              secretKeyRef:
-                name: minio-secret
-                key: MINIO_ROOT_USER
-          MINIO_SUPER_SECRET_KEY:
-            valueFrom:
-              secretKeyRef:
-                name: minio-secret
-                key: MINIO_ROOT_PASSWORD
-          MINIO_BUCKET_NAME:
-            valueFrom:
-              secretKeyRef:
-                name: mealie-data-restic-secret
-                key: AWS_ACCESS_KEY_ID
-          MINIO_BUCKET_PASSWORD:
-            valueFrom:
-              secretKeyRef:
-                name: mealie-data-restic-secret
-                key: AWS_SECRET_ACCESS_KEY
+    controllers:
+      main:
+        initContainers:
+          minio-init-bucket:
+            image:
+              repository: ghcr.io/qlonik/minio-init-bucket
+              tag: RELEASE.2023-04-12T02-21-51Z@sha256:4ce4b3e62f4a1922bbcb9cfbcac529d42ba1702a0914fbdcd79a3bb00425ee2c
+            env:
+              MINIO_HOST: http://minio.default.svc.cluster.local:9000
+              MINIO_SUPER_ACCESS_KEY:
+                valueFrom:
+                  secretKeyRef:
+                    name: minio-secret
+                    key: MINIO_ROOT_USER
+              MINIO_SUPER_SECRET_KEY:
+                valueFrom:
+                  secretKeyRef:
+                    name: minio-secret
+                    key: MINIO_ROOT_PASSWORD
+              MINIO_BUCKET_NAME:
+                valueFrom:
+                  secretKeyRef:
+                    name: mealie-data-restic-secret
+                    key: AWS_ACCESS_KEY_ID
+              MINIO_BUCKET_PASSWORD:
+                valueFrom:
+                  secretKeyRef:
+                    name: mealie-data-restic-secret
+                    key: AWS_SECRET_ACCESS_KEY
diff --git a/kubernetes/apps/default/mealie/api/patches/postgres-init.yaml b/kubernetes/apps/default/mealie/api/patches/postgres-init.yaml
@@ -6,34 +6,38 @@ metadata:
   namespace: default
 spec:
   values:
-    initContainers:
-      init-db:
-        image: ghcr.io/onedr0p/postgres-init:14.8
-        env:
-          - name: INIT_POSTGRES_HOST
-            value: postgres-rw.default.svc.cluster.local
-          - name: INIT_POSTGRES_SUPER_USER
-            valueFrom:
-              secretKeyRef:
-                name: postgres-secret
-                key: username
-          - name: INIT_POSTGRES_SUPER_PASS
-            valueFrom:
-              secretKeyRef:
-                name: postgres-secret
-                key: password
-          - name: INIT_POSTGRES_USER
-            valueFrom:
-              secretKeyRef:
-                name: mealie-secret
-                key: POSTGRES_USER
-          - name: INIT_POSTGRES_PASS
-            valueFrom:
-              secretKeyRef:
-                name: mealie-secret
-                key: POSTGRES_PASSWORD
-          - name: INIT_POSTGRES_DBNAME
-            valueFrom:
-              secretKeyRef:
-                name: mealie-secret
-                key: POSTGRES_DB
+    controllers:
+      main:
+        initContainers:
+          init-db:
+            image:
+              repository: ghcr.io/onedr0p/postgres-init
+              tag: 14.8
+            env:
+              - name: INIT_POSTGRES_HOST
+                value: postgres-rw.default.svc.cluster.local
+              - name: INIT_POSTGRES_SUPER_USER
+                valueFrom:
+                  secretKeyRef:
+                    name: postgres-secret
+                    key: username
+              - name: INIT_POSTGRES_SUPER_PASS
+                valueFrom:
+                  secretKeyRef:
+                    name: postgres-secret
+                    key: password
+              - name: INIT_POSTGRES_USER
+                valueFrom:
+                  secretKeyRef:
+                    name: mealie-secret
+                    key: POSTGRES_USER
+              - name: INIT_POSTGRES_PASS
+                valueFrom:
+                  secretKeyRef:
+                    name: mealie-secret
+                    key: POSTGRES_PASSWORD
+              - name: INIT_POSTGRES_DBNAME
+                valueFrom:
+                  secretKeyRef:
+                    name: mealie-secret
+                    key: POSTGRES_DB