From e3817a200f3ddbf62e8289141d9b59b23170e077 Mon Sep 17 00:00:00 2001
From: xeruf <27jf@pm.me>
Date: Sat, 26 Apr 2025 00:04:46 +0200
Subject: [PATCH] apps/support/zammad: simplify config

---
 README.md                                     |  9 ++++-----
 .../zammad-secrets/zammad-variables.yaml      |  1 -
 apps/support/zammad/zammad-postgres-pvc.yaml  |  2 +-
 apps/support/zammad/zammad-pvc.yaml           | 15 ---------------
 apps/support/zammad/zammad-release.yaml       |  2 +-
 .../zammad/zammad-values-configmap.yaml       | 19 ++++---------------
 6 files changed, 10 insertions(+), 38 deletions(-)
 delete mode 100644 apps/support/zammad/zammad-pvc.yaml

diff --git a/README.md b/README.md
index 428c368..5bfca36 100644
--- a/README.md
+++ b/README.md
@@ -32,16 +32,15 @@ Below list is formatted as:
 - status: Gatus (minicloudlabs)
 #### No SSO
 - ninja: InvoiceNinja
-- support: Zammad [needs PVC fixed]
+- support: Zammad
 - flow: n8n (8gears)
 - meet: cal.com (pyrrha)
 #### Planned
-- design: penpot (truecharts, waiting on PR)
+- design: penpot
 - sprint: taiga (nemonik)
-- video: Peertube ([LecygneNoir](https://git.lecygnenoir.info/LecygneNoir/peertube-helm)
-)
+- video: Peertube ([LecygneNoir](https://git.lecygnenoir.info/LecygneNoir/peertube-helm))
 - call: Jitsi Meet / OpenTalk / Element Call
-- wiki: Wiki (maybe wikijs, but I'd like something that integrates with Nextcloud and Markdown/Orgdown)
+- wiki/know: Wiki (maybe wikijs, but I'd like something that integrates with Nextcloud and Markdown/Orgdown)
 #### Ideas
 - link: URL Shortener
 - connect: Bonfire
diff --git a/apps/support/zammad-secrets/zammad-variables.yaml b/apps/support/zammad-secrets/zammad-variables.yaml
index 065a571..7ce5dc3 100644
--- a/apps/support/zammad-secrets/zammad-variables.yaml
+++ b/apps/support/zammad-secrets/zammad-variables.yaml
@@ -6,7 +6,6 @@ metadata:
   namespace: flux-system
 spec:
   fields:
-  - fieldName: minio_password
   - fieldName: redis_password
   - fieldName: postgresql_password
   - fieldName: postgresql_postgres_password
diff --git a/apps/support/zammad/zammad-postgres-pvc.yaml b/apps/support/zammad/zammad-postgres-pvc.yaml
index ec6a430..92cb7a4 100644
--- a/apps/support/zammad/zammad-postgres-pvc.yaml
+++ b/apps/support/zammad/zammad-postgres-pvc.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: zammad-postgres
+  name: zammad-postgres-data
   namespace: stackspout
   labels:
     stackspin.net/backupSet: "zammad"
diff --git a/apps/support/zammad/zammad-pvc.yaml b/apps/support/zammad/zammad-pvc.yaml
deleted file mode 100644
index 5d2af63..0000000
--- a/apps/support/zammad/zammad-pvc.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: zammad-data
-  namespace: stackspout
-  labels:
-    stackspin.net/backupSet: "zammad"
-spec:
-  accessModes:
-    - ReadWriteOnce
-  volumeMode: Filesystem
-  resources:
-    requests:
-      storage: 2Gi
-  storageClassName: local-path
diff --git a/apps/support/zammad/zammad-release.yaml b/apps/support/zammad/zammad-release.yaml
index 992c04e..5fccc44 100644
--- a/apps/support/zammad/zammad-release.yaml
+++ b/apps/support/zammad/zammad-release.yaml
@@ -8,7 +8,7 @@ spec:
   chart:
     spec:
       chart: zammad
-      version: 10.3.4 # 12.2.0
+      version: 10.3.4 # 12.5.1 # 14.0.1 requires db upgrade
       # Migration: https://github.com/zammad/zammad-helm/tree/main/zammad#upgrading
       # Versions: https://github.com/zammad/zammad-helm/blob/main/zammad/Chart.yaml
       # History: https://github.com/zammad/zammad-helm/releases
diff --git a/apps/support/zammad/zammad-values-configmap.yaml b/apps/support/zammad/zammad-values-configmap.yaml
index 7bd3d82..8e9e8d2 100644
--- a/apps/support/zammad/zammad-values-configmap.yaml
+++ b/apps/support/zammad/zammad-values-configmap.yaml
@@ -6,13 +6,10 @@ metadata:
 data:
   values.yaml: |
     # https://github.com/zammad/zammad-helm/blob/main/zammad/values.yaml
-    # TODO https://github.com/zammad/zammad-helm/issues/259
     commonLabels:
       stackspin.net/backupSet: "zammad"
     podLabels:
       stackspin.net/backupSet: "zammad"
-    podAnnotations:
-      backup.velero.io/backup-volumes: "zammad-var"
 
     ingress:
       enabled: true
@@ -52,25 +49,17 @@ data:
         backup.velero.io/backup-volumes: "data"
       primary:
         persistence:
-          existingClaim: zammad-postgres
-
-    minio:
-      auth:
-        rootUser: "zammadadmin"
-        rootPasswort: "${minio_password}"
+          existingClaim: zammad-postgres-data
 
     redis:
       auth:
         password: "${redis_password}"
 
-    persistence:
-      enabled: true
-      existingClaim: zammad-data
-
     autoWizard:
       enabled: false
 
-    # TODO Adjust zammad Mailing config
+    # Zammad has no option for SMTP pre-config and no OIDC support so far
+    # Adjust zammad Mailing config
     #    mailer:
     #      enabled: "${outgoing_mail_enabled}"
     #      host: "${outgoing_mail_smtp_host}"
@@ -78,7 +67,7 @@ data:
     #      username: "${outgoing_mail_smtp_user}"
     #      password: "${outgoing_mail_smtp_password}"
     #      fromemail: "${outgoing_mail_from_address}"
-    # TODO Adjust zammad OpenID Connect Single Sign-On Configuration
+    # Adjust zammad OpenID Connect Single Sign-On Configuration
     #    - name: Stackspin
     #      key: "${client_id}"
     #      secret: "${client_secret}"