Optimized global template (caoyingjunz#455)

leoiceo · Jul 10, 2024 · b074197 · b074197
1 parent 9dc2051
commit b074197
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/template/globals.go b/template/globals.go
@@ -26,7 +26,7 @@ enable_kubernetes_ha: "yes"
 kube_vip_address: "{{ .Kubernetes.ApiServer }}"
 {{- end }}
 
-{{- if ne .Kubernetes.ApiPort "" }}
+{{- if .Kubernetes.ApiPort }}
 kube_vip_port: "{{ .Kubernetes.ApiPort }}"
 {{- end }}
 
@@ -37,14 +37,12 @@ service_cidr: "{{ .Network.ServiceNetwork }}"
 
 network_interface: "{{ .Network.NetworkInterface }}"
 
-{{- if .Component.Haproxy }}
-{{- if .Component.Haproxy.Enable }}
+{{- if and .Component.Haproxy .Component.Haproxy.Enable }}
 enable_haproxy: "yes"
-{{- if ne .Component.Haproxy.KeepalivedVirtualRouterId "" }}
+{{- if .Component.Haproxy.KeepalivedVirtualRouterId }}
 keepalived_virtual_router_id: "{{ .Component.Haproxy.KeepalivedVirtualRouterId }}"
 {{- end }}
 {{- end }}
-{{- end }}
 
 {{- if eq .Network.Cni "calico" }}
 enable_calico: "yes"