From 4e2a191aaefcc654d48fc15f9f05d4ec99ca3d30 Mon Sep 17 00:00:00 2001
From: Martin Gruner <mg@zammad.com>
Date: Mon, 20 Nov 2023 14:44:43 +0100
Subject: [PATCH] Fixes: #231 - Allow execution of custom code in zammad-init
 container (#233)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Fixes: #231 - Allow execution of custom code in zammad-init container

* Bump version.

* Update zammad/templates/configmap-init.yaml

Co-authored-by: André Bauer <monotek@users.noreply.github.com>

* Update zammad/values.yaml

Co-authored-by: André Bauer <monotek@users.noreply.github.com>

* Update zammad/Chart.yaml

Co-authored-by: André Bauer <monotek@users.noreply.github.com>

* Replace ... with more accessible ellipsis sign.

---------

Co-authored-by: André Bauer <monotek@users.noreply.github.com>
---
 .github/PULL_REQUEST_TEMPLATE.md     | 2 +-
 .github/kubeconform.sh               | 4 ++--
 zammad/Chart.yaml                    | 2 +-
 zammad/templates/configmap-init.yaml | 3 +++
 zammad/values.yaml                   | 2 ++
 5 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index bc531e57..f9ab09a0 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -23,7 +23,7 @@ even continue reviewing your changes.
 
 #### Which issue this PR fixes
 
-*(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*
+*(optional, in `fixes #<issue number>(, fixes #<issue_number>, …)` format, will close that issue when PR gets merged)*
 
 - fixes #
 
diff --git a/.github/kubeconform.sh b/.github/kubeconform.sh
index 95e7766d..86bfbd60 100755
--- a/.github/kubeconform.sh
+++ b/.github/kubeconform.sh
@@ -14,9 +14,9 @@ sudo tar -C /usr/local/bin -xf /tmp/kubeconform.tar.gz kubeconform
 
 # validate charts
 for CHART_DIR in ${CHART_DIRS};do
-  echo "helm dependency build..."
+  echo "helm dependency build…"
   helm dependency build "${CHART_DIR}"
 
-  echo "kubeconform(ing) ${CHART_DIR##charts/} chart..."
+  echo "kubeconform(ing) ${CHART_DIR##charts/} chart…"
   helm template "${CHART_DIR}" | kubeconform --strict --verbose --kubernetes-version "${KUBERNETES_VERSION#v}"
 done
diff --git a/zammad/Chart.yaml b/zammad/Chart.yaml
index a465d5e9..79d1cc43 100644
--- a/zammad/Chart.yaml
+++ b/zammad/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: zammad
-version: 10.0.5
+version: 10.1.0
 appVersion: 6.1.0-24
 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
diff --git a/zammad/templates/configmap-init.yaml b/zammad/templates/configmap-init.yaml
index cc2c4d89..9bf9e7df 100644
--- a/zammad/templates/configmap-init.yaml
+++ b/zammad/templates/configmap-init.yaml
@@ -36,4 +36,7 @@ data:
     if [ -n "${AUTOWIZARD_JSON}" ]; then
         echo "${AUTOWIZARD_JSON}" | base64 -d > /opt/zammad/var/auto_wizard.json
     fi
+      {{- with .Values.zammadConfig.initContainers.zammad.customInit }}
+        {{- toYaml . | nindent 4 }}
+      {{- end }}
     echo "zammad init complete :)"
diff --git a/zammad/values.yaml b/zammad/values.yaml
index 3f785c74..3175bc59 100644
--- a/zammad/values.yaml
+++ b/zammad/values.yaml
@@ -292,6 +292,8 @@ zammadConfig:
             - ALL
         readOnlyRootFilesystem: true
         privileged: false
+      customInit: ""
+        #  bundle exec rails runner '…'
 
 # additional environment vars added to all zammad services
 extraEnv: []