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

…#233) * Fixes: #231 - Allow execution of custom code in zammad-init container * Bump version. * Update zammad/templates/configmap-init.yaml Co-authored-by: André Bauer <[email protected]> * Update zammad/values.yaml Co-authored-by: André Bauer <[email protected]> * Update zammad/Chart.yaml Co-authored-by: André Bauer <[email protected]> * Replace ... with more accessible ellipsis sign. --------- Co-authored-by: André Bauer <[email protected]>
zammad · Nov 20, 2023 · 4e2a191 · 4e2a191
1 parent 8ab0a07
commit 4e2a191
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -292,6 +292,8 @@ zammadConfig:
             - ALL
         readOnlyRootFilesystem: true
         privileged: false
+      customInit: ""
+        #  bundle exec rails runner '…'
 
 # additional environment vars added to all zammad services
 extraEnv: []
-Original file line number
+Diff line change
@@ Expand Up / @@ -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 #
@@ Expand Down @@