From 19e71af9eb3253f641faa41d473254428514745e Mon Sep 17 00:00:00 2001
From: Alexander Trost <Galexrt@googlemail.com>
Date: Wed, 23 Sep 2020 21:33:02 +0200
Subject: [PATCH] allow pod annotations to be specified (#59)

This allows pod annotations to be specified for the Pods created by the
StatefulSet.
This can be used to, e.g., Velero backups of the persistent volume.
Raise image tag to 3.5.0

Signed-off-by: Alexander Trost <galexrt@googlemail.com>
---
 zammad/Chart.yaml                 | 4 ++--
 zammad/README.md                  | 1 +
 zammad/templates/statefulset.yaml | 4 ++++
 zammad/values.yaml                | 7 +++++--
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/zammad/Chart.yaml b/zammad/Chart.yaml
index bcdf7248..48026b08 100644
--- a/zammad/Chart.yaml
+++ b/zammad/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 name: zammad
-version: 2.4.0
-appVersion: 3.4.0
+version: 2.5.0
+appVersion: 3.5.0
 description: Zammad is a web based open source helpdesk/customer support system with many features to manage customer communication via several channels like telephone, facebook, twitter, chat and e-mails.
 home: https://zammad.org
 icon: https://raw.githubusercontent.com/zammad/zammad-documentation/master/images/zammad_logo_600x520.png
diff --git a/zammad/README.md b/zammad/README.md
index 4ec2280e..8881ce7d 100644
--- a/zammad/README.md
+++ b/zammad/README.md
@@ -61,6 +61,7 @@ The following table lists the configurable parameters of the zammad chart and th
 | `envConfig.zammad.websocket.livenessProbe`         | Liveness probe on websocket                      | `true`                          |
 | `autoWizard.enabled`                               | enable autowizard                                | `false`                         |
 | `autoWizard.config`                                | autowizard json config                           | `""`                            |
+| `podAnnotations`                                   | Annotations for Pods                             | `{}`                            |
 | `persistence.enabled`                              | Enable persistence                               | `true`                          |
 | `persistence.accessModes`                          | Access modes                                     | `["ReadWriteOnce"]`             |
 | `persistence.size`                                 | Volume size                                      | `15Gi`                          |
diff --git a/zammad/templates/statefulset.yaml b/zammad/templates/statefulset.yaml
index 253c9526..5ec0f33c 100644
--- a/zammad/templates/statefulset.yaml
+++ b/zammad/templates/statefulset.yaml
@@ -12,6 +12,10 @@ spec:
       {{- include "zammad.selectorLabels" . | nindent 6 }}
   template:
     metadata:
+      {{- with .Values.podAnnotations }}
+      annotations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       labels:
         {{- include "zammad.labels" . | nindent 8 }}
     spec:
diff --git a/zammad/values.yaml b/zammad/values.yaml
index e6f3e35f..ad61a93d 100644
--- a/zammad/values.yaml
+++ b/zammad/values.yaml
@@ -1,6 +1,6 @@
 image:
   repository: zammad/zammad-docker-compose
-  tag: 3.4.0-18
+  tag: 3.5.0
   pullPolicy: IfNotPresent
   imagePullSecrets: []
   # - name: "image-pull-secret"
@@ -99,6 +99,9 @@ autoWizard:
   #     ]
   #   }
 
+podAnnotations: {}
+# my-annotation: "value"
+
 persistence:
   enabled: true
   ## A manually managed Persistent Volume and Claim
@@ -156,7 +159,7 @@ affinity: {}
 elasticsearch:
   enabled: true
   image: "zammad/zammad-docker-compose"
-  imageTag: "zammad-elasticsearch-3.4.0-18"
+  imageTag: "zammad-elasticsearch-3.5.0"
   clusterName: zammad
   replicas: 1
   # Workaround to get helm test to work in GitHub action CI