From 7600caaba0747ac2f9c3b75fbe47ae722c567b7c Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Wed, 29 Sep 2021 17:32:24 +0200
Subject: [PATCH] (fix) simplify and correct openvpn VPN_AUTH envvar generation

---
 charts/library/common/Chart.yaml                          | 2 +-
 .../common/templates/addons/vpn/openvpn/_container.tpl    | 2 +-
 .../common/templates/addons/vpn/openvpn/_secret.tpl       | 8 +-------
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/charts/library/common/Chart.yaml b/charts/library/common/Chart.yaml
index df3182896b9..81e08e5fe65 100644
--- a/charts/library/common/Chart.yaml
+++ b/charts/library/common/Chart.yaml
@@ -15,4 +15,4 @@ maintainers:
 name: common
 sources: null
 type: library
-version: 8.0.12
+version: 8.0.13
diff --git a/charts/library/common/templates/addons/vpn/openvpn/_container.tpl b/charts/library/common/templates/addons/vpn/openvpn/_container.tpl
index 1470e0625f1..5e4959c7e16 100644
--- a/charts/library/common/templates/addons/vpn/openvpn/_container.tpl
+++ b/charts/library/common/templates/addons/vpn/openvpn/_container.tpl
@@ -49,7 +49,7 @@ env:
 {{- end }}
 {{- end }}
 
-{{- if or .Values.addons.vpn.openvpn.auth }}
+{{- if or ( .Values.addons.vpn.openvpn.username ) ( .Values.addons.vpn.openvpn.password ) }}
 envFrom:
   - secretRef:
       name: {{ include "common.names.fullname" . }}-openvpn
diff --git a/charts/library/common/templates/addons/vpn/openvpn/_secret.tpl b/charts/library/common/templates/addons/vpn/openvpn/_secret.tpl
index 0bf3fbecc06..b479afb04fd 100644
--- a/charts/library/common/templates/addons/vpn/openvpn/_secret.tpl
+++ b/charts/library/common/templates/addons/vpn/openvpn/_secret.tpl
@@ -10,11 +10,5 @@ metadata:
   labels:
   {{- include "common.labels" $ | nindent 4 }}
 data:
-  {{- $vpnauth := "" }}
-  {{- if .Values.addons.vpn.openvpn.username }}
-    {{- $vpnauth = ( printf "%v;%v" .Values.addons.vpn.openvpn.username .Values.addons.vpn.openvpn.password ) }}
-  {{- else }}
-    {{- $vpnauth = .Values.addons.vpn.openvpn.password }}
-  {{- end }}
-  VPN_AUTH: {{ $vpnauth | b64enc }}
+  VPN_AUTH: {{ ( printf "%v;%v" .Values.addons.vpn.openvpn.username .Values.addons.vpn.openvpn.password ) | b64enc }}
 {{- end -}}