From c85a7d4cd930a3df84ed86ff09265490454e0265 Mon Sep 17 00:00:00 2001 From: Pavel Derendyaev Date: Thu, 8 Jan 2026 14:45:50 +0300 Subject: [PATCH 1/2] fix: prevent invalid YAML when zeebe exporter enabled without camunda exporter The else block outputting {} was incorrectly triggered when the camunda exporter was disabled, even if the zeebe/elasticsearch exporter had already been rendered. This caused invalid YAML with {} appended after the elasticsearch exporter config. Closes #4961 --- .../templates/orchestration/files/_application-unified.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/camunda-platform-8.8/templates/orchestration/files/_application-unified.yaml b/charts/camunda-platform-8.8/templates/orchestration/files/_application-unified.yaml index 8e3a8f42ca..daa6707f28 100644 --- a/charts/camunda-platform-8.8/templates/orchestration/files/_application-unified.yaml +++ b/charts/camunda-platform-8.8/templates/orchestration/files/_application-unified.yaml @@ -356,7 +356,7 @@ zeebe: usageMetricsMinimumAge: {{ .Values.orchestration.history.retention.usageMetricsMinimumAge | quote }} usageMetricsPolicyName: {{ .Values.orchestration.history.retention.usageMetricsPolicyName | quote }} {{- end }} - {{- else -}} + {{- else if not .Values.orchestration.exporters.zeebe.enabled -}} {{ " {}" }} {{- end }} {{ end -}} From 1d94d92652a1c40588c26cc41c0bd4c952e2cb1d Mon Sep 17 00:00:00 2001 From: hamza-m-masood Date: Mon, 19 Jan 2026 02:59:58 +0000 Subject: [PATCH 2/2] backport to 8.9 --- .../templates/orchestration/files/_application.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/camunda-platform-8.9/templates/orchestration/files/_application.yaml b/charts/camunda-platform-8.9/templates/orchestration/files/_application.yaml index a40afa88f1..b9778773ff 100644 --- a/charts/camunda-platform-8.9/templates/orchestration/files/_application.yaml +++ b/charts/camunda-platform-8.9/templates/orchestration/files/_application.yaml @@ -419,7 +419,7 @@ zeebe: waitPeriodBeforeArchiving: {{ .Values.orchestration.history.waitPeriodBeforeArchiving | quote }} delayBetweenRuns: {{ .Values.orchestration.history.delayBetweenRuns }} maxDelayBetweenRuns: {{ .Values.orchestration.history.maxDelayBetweenRuns }} - {{- else -}} + {{- else if not .Values.orchestration.exporters.zeebe.enabled -}} {{ " {}" }} {{- end }} {{ end -}}