Merge pull request #4023 from wireapp/release_2024-04-26_07_00

Release 2024-04-26 - (expected chart version 5.1.0)
wireapp · Apr 29, 2024 · 65470f7 · 65470f7
2 parents 02d3bf3 + 1949145
commit 65470f7
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,11 @@
+# [2024-04-26] (Chart Release 4.43.0)
+
+## Bug fixes and other updates
+
+
+* charts/brig: Fix template for settings ES CA certs (#4022)
+
+
 # [2024-04-25] (Chart Release 4.42.0)
 
 ## Release notes

diff --git a/charts/brig/templates/configmap.yaml b/charts/brig/templates/configmap.yaml
@@ -44,10 +44,10 @@ data:
       {{- if $.Values.secrets.elasticsearch }}
       credentials: /etc/wire/brig/secrets/elasticsearch-credentials.yaml
       {{- end }}
-      {{- if (include "configureElasticSearchCa" .) }}
+      {{- if eq (include "configureElasticSearchCa" .) "true" }}
       caCert: /etc/wire/brig/elasticsearch-ca/{{ include "elasticsearchTlsSecretKey" .}}
       {{- end }}
-      {{- if (include "configureAdditionalElasticSearchCa" .) }}
+      {{- if eq (include "configureAdditionalElasticSearchCa" .) "true" }}
       additionalCaCert: /etc/wire/brig/additional-elasticsearch-ca/{{ include "additionalElasticsearchTlsSecretKey" .}}
       {{- end }}
       {{- if $.Values.secrets.elasticsearchAdditional }}