Skip to content
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

Jump to bottom

[CN-1328] Fix ${serviceName} property which references to empty string #437

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

[CN-1328] Fix ${serviceName} property which references to empty string #437

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
427e6e4
generate hazelcast config in helpers tpl
semihbkgr Jun 28, 2024
811cd0c
update comment
semihbkgr Jul 30, 2024
bb6470d
update the enterprise chart
semihbkgr Jul 30, 2024
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
21 changes: 10 additions & 11 deletions stable/hazelcast-enterprise/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,19 +54,18 @@ Create the name of the service to use
{{- end -}}

{{/*
Create the config of the service-name to use
Generate the Hazelcast configuration, ensuring that any conflicting discovery configurations are resolved.
Remove the default value for the 'service-name' field when other discovery mechanisms are explicitly used.
*/}}
{{- define "hazelcast.serviceNameConfig" -}}
{{- if and ((((((.Values.hazelcast).yaml).hazelcast).network).join).kubernetes)
(or
(index .Values.hazelcast.yaml.hazelcast.network.join.kubernetes "service-dns")
(index .Values.hazelcast.yaml.hazelcast.network.join.kubernetes "service-label-name")
(index .Values.hazelcast.yaml.hazelcast.network.join.kubernetes "pod-label-name")
) -}}
{{ default "" }}
{{- else -}}
{{ template "hazelcast.serviceName" .}}
{{- define "hazelcast.config" -}}
{{- $config := .Values.hazelcast.yaml | deepCopy -}}
{{- $k8sJoin := $config.hazelcast.network.join.kubernetes -}}
{{- if and $k8sJoin -}}
{{- if or (index $k8sJoin "service-dns") (index $k8sJoin "service-label-name") (index $k8sJoin "pod-label-name") -}}
{{- $_ := unset $k8sJoin "service-name" -}}
{{- end -}}
{{- end -}}
{{- toYaml $config -}}
{{- end -}}

{{/*
Expand Down
2 changes: 1 addition & 1 deletion stable/hazelcast-enterprise/templates/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@ data:
{{ $val | indent 4}}
{{- end }}
hazelcast.yaml: |-
{{ toYaml .Values.hazelcast.yaml | indent 4 }}
{{ include "hazelcast.config" . | indent 4 }}
{{- end -}}
2 changes: 1 addition & 1 deletion stable/hazelcast-enterprise/templates/statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ spec:
{{- toYaml . | nindent 8 }}
{{- end }}
- name: JAVA_OPTS
value: "-Dhazelcast.config=/data/hazelcast/hazelcast.yaml -DserviceName={{ template "hazelcast.serviceNameConfig" . }} -Dnamespace={{ .Release.Namespace }} -Dhazelcast.persistence={{ .Values.persistence.enabled }} {{ if .Values.persistence.enabled }}-Dhazelcast.stale.join.prevention.duration.seconds=5{{ end }} -Dhz.jet.enabled={{ .Values.jet.enabled }} {{ if .Values.gracefulShutdown.enabled }}-Dhazelcast.shutdownhook.policy=GRACEFUL -Dhazelcast.shutdownhook.enabled=true -Dhazelcast.graceful.shutdown.max.wait={{ .Values.gracefulShutdown.maxWaitSeconds }} {{ end }} -Dhazelcast.cluster.version.auto.upgrade.enabled={{ .Values.hazelcast.updateClusterVersionAfterRollingUpgrade }} {{ if .Values.metrics.enabled }}-Dhazelcast.jmx=true{{ end }} {{ .Values.hazelcast.javaOpts }}"
value: "-Dhazelcast.config=/data/hazelcast/hazelcast.yaml -DserviceName={{ template "hazelcast.serviceName" . }} -Dnamespace={{ .Release.Namespace }} -Dhazelcast.persistence={{ .Values.persistence.enabled }} {{ if .Values.persistence.enabled }}-Dhazelcast.stale.join.prevention.duration.seconds=5{{ end }} -Dhz.jet.enabled={{ .Values.jet.enabled }} {{ if .Values.gracefulShutdown.enabled }}-Dhazelcast.shutdownhook.policy=GRACEFUL -Dhazelcast.shutdownhook.enabled=true -Dhazelcast.graceful.shutdown.max.wait={{ .Values.gracefulShutdown.maxWaitSeconds }} {{ end }} -Dhazelcast.cluster.version.auto.upgrade.enabled={{ .Values.hazelcast.updateClusterVersionAfterRollingUpgrade }} {{ if .Values.metrics.enabled }}-Dhazelcast.jmx=true{{ end }} {{ .Values.hazelcast.javaOpts }}"
{{- if .Values.hazelcast.loggingLevel }}
- name: LOGGING_LEVEL
value: {{ .Values.hazelcast.loggingLevel }}
Expand Down
21 changes: 10 additions & 11 deletions stable/hazelcast/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,19 +54,18 @@ Create the name of the service to use
{{- end -}}

{{/*
Create the config of the service-name to use
Generate the Hazelcast configuration, ensuring that any conflicting discovery configurations are resolved.
Remove the default value for the 'service-name' field when other discovery mechanisms are explicitly used.
*/}}
{{- define "hazelcast.serviceNameConfig" -}}
{{- if and ((((((.Values.hazelcast).yaml).hazelcast).network).join).kubernetes)
(or
(index .Values.hazelcast.yaml.hazelcast.network.join.kubernetes "service-dns")
(index .Values.hazelcast.yaml.hazelcast.network.join.kubernetes "service-label-name")
(index .Values.hazelcast.yaml.hazelcast.network.join.kubernetes "pod-label-name")
) -}}
{{ default "" }}
{{- else -}}
{{ template "hazelcast.serviceName" .}}
{{- define "hazelcast.config" -}}
{{- $config := .Values.hazelcast.yaml | deepCopy -}}
{{- $k8sJoin := $config.hazelcast.network.join.kubernetes -}}
{{- if and $k8sJoin -}}
{{- if or (index $k8sJoin "service-dns") (index $k8sJoin "service-label-name") (index $k8sJoin "pod-label-name") -}}
{{- $_ := unset $k8sJoin "service-name" -}}
{{- end -}}
{{- end -}}
{{- toYaml $config -}}
{{- end -}}

{{/*
Expand Down
2 changes: 1 addition & 1 deletion stable/hazelcast/templates/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@ data:
{{ $val | indent 4}}
{{- end }}
hazelcast.yaml: |-
{{ toYaml .Values.hazelcast.yaml | indent 4 }}
{{ include "hazelcast.config" . | indent 4 }}
{{- end -}}
2 changes: 1 addition & 1 deletion stable/hazelcast/templates/statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ spec:
{{- toYaml . | nindent 8 }}
{{- end }}
- name: JAVA_OPTS
value: "-Dhazelcast.config=/data/hazelcast/hazelcast.yaml -DserviceName={{ template "hazelcast.serviceNameConfig" . }} -Dnamespace={{ .Release.Namespace }} -Dhz.jet.enabled={{ .Values.jet.enabled }} {{ if .Values.gracefulShutdown.enabled }}-Dhazelcast.shutdownhook.policy=GRACEFUL -Dhazelcast.shutdownhook.enabled=true -Dhazelcast.graceful.shutdown.max.wait={{ .Values.gracefulShutdown.maxWaitSeconds }} {{ end }} {{ if .Values.metrics.enabled }}-Dhazelcast.jmx=true{{ end }} {{ .Values.hazelcast.javaOpts }}"
value: "-Dhazelcast.config=/data/hazelcast/hazelcast.yaml -DserviceName={{ template "hazelcast.serviceName" . }} -Dnamespace={{ .Release.Namespace }} -Dhz.jet.enabled={{ .Values.jet.enabled }} {{ if .Values.gracefulShutdown.enabled }}-Dhazelcast.shutdownhook.policy=GRACEFUL -Dhazelcast.shutdownhook.enabled=true -Dhazelcast.graceful.shutdown.max.wait={{ .Values.gracefulShutdown.maxWaitSeconds }} {{ end }} {{ if .Values.metrics.enabled }}-Dhazelcast.jmx=true{{ end }} {{ .Values.hazelcast.javaOpts }}"
{{- if .Values.hazelcast.loggingLevel }}
- name: LOGGING_LEVEL
value: {{ .Values.hazelcast.loggingLevel }}
Expand Down
Loading