diff --git a/stable/hazelcast-enterprise/templates/_helpers.tpl b/stable/hazelcast-enterprise/templates/_helpers.tpl index 5a360d32..edcb31ae 100644 --- a/stable/hazelcast-enterprise/templates/_helpers.tpl +++ b/stable/hazelcast-enterprise/templates/_helpers.tpl @@ -57,9 +57,12 @@ Create the name of the service to use Create the config of the service-name to use */}} {{- define "hazelcast.serviceNameConfig" -}} -{{- if 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") -}} +{{- 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" .}} diff --git a/stable/hazelcast/templates/_helpers.tpl b/stable/hazelcast/templates/_helpers.tpl index 5a360d32..edcb31ae 100644 --- a/stable/hazelcast/templates/_helpers.tpl +++ b/stable/hazelcast/templates/_helpers.tpl @@ -57,9 +57,12 @@ Create the name of the service to use Create the config of the service-name to use */}} {{- define "hazelcast.serviceNameConfig" -}} -{{- if 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") -}} +{{- 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" .}}