[CN-1109] Make the discovery plugin service-name config nil-aware (#414)

hazelcast · Jan 4, 2024 · d3f9c98 · d3f9c98
1 parent a6ee151
commit d3f9c98
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git 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
@@ -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" .}}