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 #(, fixes #, ...)` format, will close that issue when PR gets merged)* +*(optional, in `fixes #(, fixes #, …)` 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: []