⬆️ wallabag app-template v2

kubernetes/apps/default/wallabag/app/helmrelease.yaml

@@ -10,7 +10,7 @@ spec:
   chart:
     spec:
       chart: app-template
-      version: 1.5.1
+      version: 2.0.3
       sourceRef:
         kind: HelmRepository
         name: bjw-s
@@ -29,40 +29,66 @@ spec:
   dependsOn:
     - name: wallabag-redis
   values:
-    controller:
+    defaultPodOptions:
-      annotations:
+      securityContext:
-        reloader.stakater.com/auto: "true"
+        runAsUser: 0
-    initContainers:
+    controllers:
-      01-init-db:
+      main:
-        image: ghcr.io/auricom/postgres-init:15.4
+        type: statefulset
-        imagePullPolicy: IfNotPresent
+        annotations:
-        envFrom: &envFrom
+          reloader.stakater.com/auto: "true"
-          - secretRef:
+        pod:
-              name: wallabag-secret
+          enableServiceLinks: false
-      02-init-migrate:
+        initContainers:
-        image: wallabag/wallabag:2.6.7
+          01-init-db:
-        envFrom: *envFrom
+            image:
-        env: &env
+              repository: ghcr.io/auricom/postgres-init
-          SYMFONY__ENV__DATABASE_DRIVER: pdo_pgsql
+              tag: 15.4@sha256:83e1abf06be5741bdfb8cb53fc03a1ade6e6b5ec7b92a8aac0c69ba5dc7e51f0
-          SYMFONY__ENV__DOMAIN_NAME: https://wallabag.${SECRET_CLUSTER_DOMAIN}
+              pullPolicy: IfNotPresent
-          SYMFONY__ENV__FOSUSER_REGISTRATION: "true"
+            envFrom: &envFrom
-          SYMFONY__ENV__FOSUSER_CONFIRMATION: "true"
+              - secretRef:
-          SYMFONY__ENV__FROM_EMAIL: wallabag@${SECRET_DOMAIN}
+                  name: wallabag-secret
-          SYMFONY__ENV__MAILER_HOST: smtp-relay.default.svc.cluster.local.
+          02-init-migrate:
-          SYMFONY__ENV__MAILER_PORT: "2525"
+            image:
-          SYMFONY__ENV__REDIS_HOST: wallabag-redis.default.svc.cluster.local.
+              repository: wallabag/wallabag
-          SYMFONY__ENV__SERVER_NAME: Wallabag
+              tag: 2.6.7
-        command:
+            envFrom: *envFrom
-          - /var/www/wallabag/bin/console
+            env: &env
-          - doctrine:migrations:migrate
+              SYMFONY__ENV__DATABASE_DRIVER: pdo_pgsql
-          - --env=prod
+              SYMFONY__ENV__DOMAIN_NAME: https://wallabag.${SECRET_CLUSTER_DOMAIN}
-          - --no-interaction
+              SYMFONY__ENV__FOSUSER_REGISTRATION: "true"
-    image:
+              SYMFONY__ENV__FOSUSER_CONFIRMATION: "true"
-      repository: wallabag/wallabag
+              SYMFONY__ENV__FROM_EMAIL: wallabag@${SECRET_DOMAIN}
-      tag: 2.6.7
+              SYMFONY__ENV__MAILER_HOST: smtp-relay.default.svc.cluster.local.
-    envFrom: *envFrom
+              SYMFONY__ENV__MAILER_PORT: "2525"
-    env: *env
+              SYMFONY__ENV__REDIS_HOST: wallabag-redis.default.svc.cluster.local.
-    enableServiceLinks: false
+              SYMFONY__ENV__SERVER_NAME: Wallabag
+            command:
+              - /var/www/wallabag/bin/console
+              - doctrine:migrations:migrate
+              - --env=prod
+              - --no-interaction
+        statefulset:
+          volumeClaimTemplates:
+            - name: config
+              accessMode: ReadWriteOnce
+              size: 2Gi
+              storageClass: rook-ceph-block
+              globalMounts:
+                - path: /images
+        containers:
+          main:
+            image:
+              repository: wallabag/wallabag
+              tag: 2.6.7
+            envFrom: *envFrom
+            env: *env
+            resources:
+              requests:
+                cpu: 100m
+                memory: 250Mi
+              limits:
+                memory: 512Mi
     service:
       main:
         ports:
@@ -71,7 +97,7 @@ spec:
     ingress:
       main:
         enabled: true
-        ingressClassName: "nginx"
+        className: "nginx"
         annotations:
           external-dns.home.arpa/enabled: "true"
           hajimari.io/icon: mdi:newspaper-variant
@@ -79,19 +105,9 @@ spec:
           - host: &host "{{ .Release.Name }}.${SECRET_CLUSTER_DOMAIN}"
             paths:
               - path: /
-                pathType: Prefix
+                service:
+                  name: main
+                  port: http
         tls:
           - hosts:
               - *host
-    securityContext:
-      runAsUser: 0
-    persistence:
-      images:
-        enabled: true
-        existingClaim: wallabag-images
-    resources:
-      requests:
-        cpu: 100m
-        memory: 250Mi
-      limits:
-        memory: 512Mi

kubernetes/apps/default/wallabag/app/kustomization.yaml

@@ -8,4 +8,3 @@ resources:
   - ./gatus.yaml
   - ./helmrelease.yaml
   - ./volsync.yaml
-  - ./volume.yaml

kubernetes/apps/default/wallabag/app/volsync.yaml

@@ -30,7 +30,7 @@ metadata:
   name: wallabag
   namespace: default
 spec:
-  sourcePVC: wallabag-images
+  sourcePVC: config-wallabag-0
   trigger:
     schedule: "0 7 * * *"
   restic:

kubernetes/apps/default/wallabag/app/volume.yaml

@@ -1,17 +0,0 @@
----
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: wallabag-images
-  namespace: default
-  labels:
-    app.kubernetes.io/name: &name wallabag
-    app.kubernetes.io/instance: *name
-    snapshot.home.arpa/enabled: "true"
-spec:
-  accessModes:
-    - ReadWriteOnce
-  storageClassName: rook-ceph-block
-  resources:
-    requests:
-      storage: 2Gi