From 8ce03a2b463b0d64236e5d4129916b09af658ad4 Mon Sep 17 00:00:00 2001
From: addshore <git@addshore.com>
Date: Sun, 27 Sep 2026 23:46:17 +0100
Subject: [PATCH] Remove duplicate Elasticsearch host from API queue
 deployments

deployment-queue.yaml already includes api.commonAppEnvVars
defined in charts/api/templates/_helpers.tpl.
That helper emits ELASTICSEARCH_HOST when app.elasticSearchHost is configured,
so the additional inline entry rendered the same environment variable twice.

During local-dev testing, changing the Elasticsearch hostname through a Helm upgrade
left one duplicate entry with the previous hostname.
Kubernetes strategic merge patches identify environment entries by name,
so duplicate names make updates ambiguous and can leave stale values in the pod specification.

Remove the inline entry and retain the shared helper as the single source of ELASTICSEARCH_HOST.
When the host is configured, the rendered queue deployment now contains exactly one entry with the configured value.

**API chart `0.36.0` introduced the duplicate**, in commit `89fbef2`
---
 charts/api/CHANGELOG.md                    | 3 +++
 charts/api/Chart.yaml                      | 2 +-
 charts/api/templates/deployment-queue.yaml | 2 --
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/charts/api/CHANGELOG.md b/charts/api/CHANGELOG.md
index 0c9066a..a1e5b76 100644
--- a/charts/api/CHANGELOG.md
+++ b/charts/api/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 This chart does not yet follow SemVer.
 
+## 0.36.1
+- Remove the duplicate `ELASTICSEARCH_HOST` from queue deployments; use the shared environment helper.
+
 ## 0.36.0
 - Populates env var `ELASTICSEARCH_HOST`
 - Removes env vars
diff --git a/charts/api/Chart.yaml b/charts/api/Chart.yaml
index 24dc13f..240d654 100644
--- a/charts/api/Chart.yaml
+++ b/charts/api/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: "1.0"
 description: A Helm chart for the WBStack API
 name: api
-version: 0.36.0
+version: 0.36.1
 home: https://github.com/wbstack
 maintainers:
   - name: WBstack
diff --git a/charts/api/templates/deployment-queue.yaml b/charts/api/templates/deployment-queue.yaml
index 2e4b635..4385fc3 100644
--- a/charts/api/templates/deployment-queue.yaml
+++ b/charts/api/templates/deployment-queue.yaml
@@ -70,8 +70,6 @@ spec:
             value: {{ $.Values.app.elasticsearch.curlTimeout.indexInit | quote }}
             {{- end }}
 
-          - name: ELASTICSEARCH_HOST
-            value: {{ $.Values.app.elasticSearchHost | quote }}
           - name: QUERY_SERVICE_HOST
             value: {{ $.Values.app.queryServiceHost | quote }}