Skip to content

Commit 94f7c47

Browse files
return empty nodeips during chart rendering dry-run (#5760)
Signed-off-by: Abhishek Pandey <abhpandey@microsoft.com>
1 parent c959d53 commit 94f7c47

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,12 @@ 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 $nodes -}}
6264
{{- $ips := list -}}
6365
{{- range $node := $nodes.items -}}
6466
{{- range $label, $value := $.Values.masterNodesLabels }}
@@ -77,6 +79,7 @@ Get IP-addresses of master nodes
7779
{{- end -}}
7880
{{ join "," $ips }}
7981
{{- end -}}
82+
{{- end -}}
8083

8184
{{/*
8285
Number of master nodes

charts/kube-ovn/templates/_helpers.tpl

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
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 $nodes -}}
68
{{- $ips := list -}}
79
{{- range $node := $nodes.items -}}
810
{{- $label := splitList "=" $.Values.MASTER_NODES_LABEL }}
@@ -25,6 +27,7 @@ Get IP-addresses of master nodes
2527
{{- end -}}
2628
{{ join "," $ips }}
2729
{{- end -}}
30+
{{- end -}}
2831

2932
{{/*
3033
Number of master nodes

0 commit comments

Comments
 (0)