Skip to content

Commit 94cb609

Browse files
helpers should return nothing if helm lookup returns 0 nodes
1 parent 6054370 commit 94cb609

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

charts/kube-ovn-v2/templates/_helpers.tpl

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,13 @@ Create the name of the service account to use
5555

5656

5757
{{/*
58-
Get IP-addresses of master nodes
58+
Get IP-addresses of master nodes. If no nodes are returned, we assume this is
59+
a dry-run/template call and return nothing.
5960
*/}}
6061
{{- define "kubeovn.nodeIPs" -}}
6162
{{- $nodes := lookup "v1" "Node" "" "" -}}
63+
{{- if eq (len $nodes) 0 -}}
64+
{{- else -}}
6265
{{- $ips := list -}}
6366
{{- range $node := $nodes.items -}}
6467
{{- range $label, $value := $.Values.masterNodesLabels }}
@@ -77,6 +80,7 @@ Get IP-addresses of master nodes
7780
{{- end -}}
7881
{{ join "," $ips }}
7982
{{- end -}}
83+
{{- end -}}
8084

8185
{{/*
8286
Number of master nodes

charts/kube-ovn/templates/_helpers.tpl

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
{{/*
2-
Get IP-addresses of master nodes
2+
Get IP-addresses of master nodes. If no nodes are returned, we assume this is
3+
a dry-run/template call and return nothing.
34
*/}}
45
{{- define "kubeovn.nodeIPs" -}}
56
{{- $nodes := lookup "v1" "Node" "" "" -}}
7+
{{- if eq (len $nodes) 0 -}}
8+
{{- else -}}
69
{{- $ips := list -}}
710
{{- range $node := $nodes.items -}}
811
{{- $label := splitList "=" $.Values.MASTER_NODES_LABEL }}
@@ -25,6 +28,7 @@ Get IP-addresses of master nodes
2528
{{- end -}}
2629
{{ join "," $ips }}
2730
{{- end -}}
31+
{{- end -}}
2832

2933
{{/*
3034
Number of master nodes

0 commit comments

Comments
 (0)