Skip to content

Commit 8b0aff7

Browse files
fix: apply dual-region exclusion logic to opensearch exporter as well (#4352)
Signed-off-by: Jesse Simpson <[email protected]> Co-authored-by: Jesse Simpson <[email protected]>
1 parent 4e06bd5 commit 8b0aff7

File tree

2 files changed

+21
-2
lines changed

2 files changed

+21
-2
lines changed

charts/camunda-platform-8.8/templates/orchestration/files/_application-unified.yaml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,17 @@ zeebe:
280280
minimumAge: {{ .Values.orchestration.retention.minimumAge | quote }}
281281
policyName: {{ .Values.orchestration.retention.policyName | quote }}
282282
{{- end }}
283-
{{- else if or (and .Values.global.opensearch.enabled .Values.orchestration.exporters.zeebe.enabled) (and .Values.global.opensearch.enabled .Values.optimize.enabled) (and .Values.global.opensearch.enabled .Values.orchestration.migration.data.enabled) }}
283+
{{- else if and
284+
(or
285+
(and .Values.global.opensearch.enabled .Values.orchestration.exporters.zeebe.enabled)
286+
(and .Values.global.opensearch.enabled .Values.optimize.enabled)
287+
(and .Values.global.opensearch.enabled .Values.orchestration.migration.data.enabled)
288+
)
289+
(or
290+
.Values.orchestration.exporters.zeebe.enabled
291+
(lt (int (default 0 .Values.global.multiregion.regions)) 2)
292+
)
293+
}}
284294
opensearch:
285295
className: "io.camunda.zeebe.exporter.opensearch.OpensearchExporter"
286296
args:

charts/camunda-platform-8.9/templates/orchestration/files/_application-unified.yaml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,16 @@ zeebe:
278278
minimumAge: {{ .Values.orchestration.retention.minimumAge | quote }}
279279
policyName: {{ .Values.orchestration.retention.policyName | quote }}
280280
{{- end }}
281-
{{- else if or (and .Values.global.opensearch.enabled .Values.orchestration.exporters.zeebe.enabled) (and .Values.global.opensearch.enabled .Values.optimize.enabled) }}
281+
{{- else if and
282+
(or
283+
(and .Values.global.opensearch.enabled .Values.orchestration.exporters.zeebe.enabled)
284+
(and .Values.global.opensearch.enabled .Values.optimize.enabled)
285+
)
286+
(or
287+
.Values.orchestration.exporters.zeebe.enabled
288+
(lt (int (default 0 .Values.global.multiregion.regions)) 2)
289+
)
290+
}}
282291
opensearch:
283292
className: "io.camunda.zeebe.exporter.opensearch.OpensearchExporter"
284293
args:

0 commit comments

Comments
 (0)