Skip to content

Commit

Permalink
Fixes: #231 - Allow execution of custom code in zammad-init container (
Browse files Browse the repository at this point in the history
…#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 <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>
  • Loading branch information
mgruner and monotek authored Nov 20, 2023
1 parent 8ab0a07 commit 4e2a191
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff 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
4 changes: 2 additions & 2 deletions .github/kubeconform.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion zammad/Chart.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 3 additions & 0 deletions zammad/templates/configmap-init.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 :)"
2 changes: 2 additions & 0 deletions zammad/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -292,6 +292,8 @@ zammadConfig:
- ALL
readOnlyRootFilesystem: true
privileged: false
customInit: ""
# bundle exec rails runner '…'

# additional environment vars added to all zammad services
extraEnv: []
Expand Down

0 comments on commit 4e2a191

Please sign in to comment.