Fix Go 1.14 templating (helm#22795)

Signed-off-by: Gorka Maiztegi <gmaiztegi@reviewpro.com>
minddocdev · Jun 15, 2020 · 529e449 · 529e449
1 parent ac00d85
commit 529e449
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/stable/openvpn/Chart.yaml b/stable/openvpn/Chart.yaml
@@ -3,7 +3,7 @@ description: A Helm chart to install an openvpn server inside a kubernetes clust
   generation is also part of the deployment, and this chart will generate client keys
   as needed.
 name: openvpn
-version: 4.2.2
+version: 4.2.3
 appVersion: 1.1.0
 maintainers:
 - name: jasongwartz

diff --git a/stable/openvpn/templates/config-openvpn.yaml b/stable/openvpn/templates/config-openvpn.yaml
@@ -95,7 +95,7 @@ data:
       #!/bin/bash
       EASY_RSA_LOC="/etc/openvpn/certs"
       cd $EASY_RSA_LOC
-      ./easyrsa revoke $1 
+      ./easyrsa revoke $1
       ./easyrsa gen-crl
       cp ${EASY_RSA_LOC}/pki/crl.pem ${EASY_RSA_LOC}
       chmod 644 ${EASY_RSA_LOC}/crl.pem
@@ -209,10 +209,10 @@ data:
 {{ if .Values.openvpn.DEFAULT_ROUTE_ENABLED }}
       push "route NETWORK NETMASK"
 {{ end }}
-{{ if (.Values.openvpn.OVPN_K8S_POD_NETWORK) (.Values.openvpn.OVPN_K8S_POD_SUBNET) }}
+{{ if and (.Values.openvpn.OVPN_K8S_POD_NETWORK) (.Values.openvpn.OVPN_K8S_POD_SUBNET) }}
       push "route {{ .Values.openvpn.OVPN_K8S_POD_NETWORK }} {{ .Values.openvpn.OVPN_K8S_POD_SUBNET }}"
 {{ end }}
-{{ if (.Values.openvpn.OVPN_K8S_SVC_NETWORK) (.Values.openvpn.OVPN_K8S_SVC_SUBNET) }}
+{{ if and (.Values.openvpn.OVPN_K8S_SVC_NETWORK) (.Values.openvpn.OVPN_K8S_SVC_SUBNET) }}
       push "route {{ .Values.openvpn.OVPN_K8S_SVC_NETWORK }} {{ .Values.openvpn.OVPN_K8S_SVC_SUBNET }}"
 {{ end }}