Exclude the Elasticsearch host from proxy routing on new installations

zammad/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: zammad
-version: 18.0.5
+version: 18.1.0
 appVersion: 7.1.3-0011
 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

zammad/README.md

@@ -71,6 +71,9 @@ helm repo add zammad https://zammad.github.io/zammad-helm
 helm upgrade --install zammad zammad/zammad
 ```
 
+Database migration and seeding run in a separate init job. `--wait` does not wait for jobs, so add
+`--wait --wait-for-jobs` if your tooling must not continue until Zammad is initialised.
+
 Once the Zammad pod is ready, it can be accessed using the ingress or port forwarding.
 To use port forwarding:
 

zammad/templates/configmap-init.yaml

@@ -14,6 +14,14 @@ data:
 
     if ! (bundle exec rails r 'puts User.any?' 2> /dev/null | grep -q true); then
         bundle exec rake db:migrate db:seed
+    {{- if .Values.zammadConfig.elasticsearch.initialisation }}
+
+        # Elasticsearch is contacted directly, not through a configured proxy. Only done on first
+        #   install, so that admins can change the value later.
+        ELASTICSEARCH_HOST="{{ include "zammad.elasticsearchHost" . }}"
+        echo "Excluding ${ELASTICSEARCH_HOST} from proxy routing..."
+        bundle exec rails r "Setting.set('proxy_no', '${ELASTICSEARCH_HOST}')"
+    {{- end }}
     else
         echo Executing migrations...
         bundle exec rake db:migrate

zammad/templates/tests/run-tests.yaml

@@ -43,7 +43,7 @@ metadata:
   annotations:
     "helm.sh/hook": test
 spec:
-  activeDeadlineSeconds: 30
+  activeDeadlineSeconds: 600
   backoffLimit: 0
   template:
     metadata:
@@ -53,8 +53,10 @@ spec:
         {{- include "zammad.podSpec.deployment" . | nindent 8 }}
         containers:
           - name: zammad-run-tests
-            # Use securityContext etc. from railsserver to have identical setup.
-            {{- include "zammad.containerSpec" (merge (dict "containerConfig" .Values.zammadConfig.railsserver) .) | nindent 12 }}
+            # Use securityContext etc. from railsserver to have identical setup, but not its
+            #   probes: this container runs a rake task and never listens on the railsserver port,
+            #   so the startup probe would always fail and kill it after failureThreshold periods.
+            {{- include "zammad.containerSpec" (merge (dict "containerConfig" (omit .Values.zammadConfig.railsserver "startupProbe" "livenessProbe" "readinessProbe")) .) | nindent 12 }}
             command: ['bundle']
             args: ['exec', 'rake', 'zammad:helm:test']
             env: