Skip to content

fix: wrong openshift compatibilty helper elasticsearch commonLabels usage #4180

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Sep 18, 2025
Merged

fix: wrong openshift compatibilty helper elasticsearch commonLabels usage #4180

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9b108ba
fix: adjust openshift helper
bkenez Sep 16, 2025
0fc7927
Merge branch 'main' into 4146-es-commonlabel-fix
bkenez Sep 16, 2025
d501830
Merge branch 'main' into 4146-es-commonlabel-fix
bkenez Sep 16, 2025
7c0b525
Merge branch 'main' into 4146-es-commonlabel-fix
bkenez Sep 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion charts/camunda-platform-8.8/templates/z/1/2/3/4/5/6/7/8/z_compatibility_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,9 +465,13 @@ Also, recent OpenShift versions (> 4.10) have adjusted the virtual memory of the
OpenShift.
The label `tuned.openshift.io/elasticsearch` is added to ensure compatibility with the previous Camunda Helm charts.
Without this label, the Helm upgrade will fail for OpenShift because it is already set for the volumeClaimTemplate.
This is only needed when elasticsearch is actually enabled and deployed.
*/}}

{{- if eq .Values.global.compatibility.openshift.adaptSecurityContext "force" -}}
{{- if and (eq .Values.global.compatibility.openshift.adaptSecurityContext "force") .Values.elasticsearch.enabled -}}
{{- if not (hasKey .Values.elasticsearch "commonLabels") -}}
{{- $_ := set .Values.elasticsearch "commonLabels" (dict) -}}
{{- end -}}
{{- if not (hasKey .Values.elasticsearch.commonLabels "tuned.openshift.io/elasticsearch") -}}
{{- $_ := set .Values.elasticsearch.commonLabels "tuned.openshift.io/elasticsearch" "" -}}
{{- end -}}
Expand Down
Loading