From 4d0534de027e0c3712c0bc3e5611f184b6ece351 Mon Sep 17 00:00:00 2001 From: auricom <27022259+auricom@users.noreply.github.com> Date: Sat, 4 Nov 2023 16:57:09 +0100 Subject: [PATCH] =?UTF-8?q?=20=E2=AC=86=EF=B8=8F=20wallabag=20app-template?= =?UTF-8?q?=20v2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../default/wallabag/app/helmrelease.yaml | 114 ++++++++++-------- .../default/wallabag/app/kustomization.yaml | 1 - .../apps/default/wallabag/app/volsync.yaml | 2 +- .../apps/default/wallabag/app/volume.yaml | 17 --- 4 files changed, 66 insertions(+), 68 deletions(-) delete mode 100644 kubernetes/apps/default/wallabag/app/volume.yaml diff --git a/kubernetes/apps/default/wallabag/app/helmrelease.yaml b/kubernetes/apps/default/wallabag/app/helmrelease.yaml index d9c93a2f2..15d551c1a 100644 --- a/kubernetes/apps/default/wallabag/app/helmrelease.yaml +++ b/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: - annotations: - reloader.stakater.com/auto: "true" - initContainers: - 01-init-db: - image: ghcr.io/auricom/postgres-init:15.4 - imagePullPolicy: IfNotPresent - envFrom: &envFrom - - secretRef: - name: wallabag-secret - 02-init-migrate: - image: wallabag/wallabag:2.6.7 - envFrom: *envFrom - env: &env - SYMFONY__ENV__DATABASE_DRIVER: pdo_pgsql - SYMFONY__ENV__DOMAIN_NAME: https://wallabag.${SECRET_CLUSTER_DOMAIN} - SYMFONY__ENV__FOSUSER_REGISTRATION: "true" - SYMFONY__ENV__FOSUSER_CONFIRMATION: "true" - SYMFONY__ENV__FROM_EMAIL: wallabag@${SECRET_DOMAIN} - SYMFONY__ENV__MAILER_HOST: smtp-relay.default.svc.cluster.local. - SYMFONY__ENV__MAILER_PORT: "2525" - SYMFONY__ENV__REDIS_HOST: wallabag-redis.default.svc.cluster.local. - SYMFONY__ENV__SERVER_NAME: Wallabag - command: - - /var/www/wallabag/bin/console - - doctrine:migrations:migrate - - --env=prod - - --no-interaction - image: - repository: wallabag/wallabag - tag: 2.6.7 - envFrom: *envFrom - env: *env - enableServiceLinks: false + defaultPodOptions: + securityContext: + runAsUser: 0 + controllers: + main: + type: statefulset + annotations: + reloader.stakater.com/auto: "true" + pod: + enableServiceLinks: false + initContainers: + 01-init-db: + image: + repository: ghcr.io/auricom/postgres-init + tag: 15.4@sha256:83e1abf06be5741bdfb8cb53fc03a1ade6e6b5ec7b92a8aac0c69ba5dc7e51f0 + pullPolicy: IfNotPresent + envFrom: &envFrom + - secretRef: + name: wallabag-secret + 02-init-migrate: + image: + repository: wallabag/wallabag + tag: 2.6.7 + envFrom: *envFrom + env: &env + SYMFONY__ENV__DATABASE_DRIVER: pdo_pgsql + SYMFONY__ENV__DOMAIN_NAME: https://wallabag.${SECRET_CLUSTER_DOMAIN} + SYMFONY__ENV__FOSUSER_REGISTRATION: "true" + SYMFONY__ENV__FOSUSER_CONFIRMATION: "true" + SYMFONY__ENV__FROM_EMAIL: wallabag@${SECRET_DOMAIN} + SYMFONY__ENV__MAILER_HOST: smtp-relay.default.svc.cluster.local. + SYMFONY__ENV__MAILER_PORT: "2525" + SYMFONY__ENV__REDIS_HOST: wallabag-redis.default.svc.cluster.local. + 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 diff --git a/kubernetes/apps/default/wallabag/app/kustomization.yaml b/kubernetes/apps/default/wallabag/app/kustomization.yaml index 1ac8f8607..c254171ab 100644 --- a/kubernetes/apps/default/wallabag/app/kustomization.yaml +++ b/kubernetes/apps/default/wallabag/app/kustomization.yaml @@ -8,4 +8,3 @@ resources: - ./gatus.yaml - ./helmrelease.yaml - ./volsync.yaml - - ./volume.yaml diff --git a/kubernetes/apps/default/wallabag/app/volsync.yaml b/kubernetes/apps/default/wallabag/app/volsync.yaml index 77cb9a7bd..24b14943a 100644 --- a/kubernetes/apps/default/wallabag/app/volsync.yaml +++ b/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: diff --git a/kubernetes/apps/default/wallabag/app/volume.yaml b/kubernetes/apps/default/wallabag/app/volume.yaml deleted file mode 100644 index a22329728..000000000 --- a/kubernetes/apps/default/wallabag/app/volume.yaml +++ /dev/null @@ -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