From ab1b39b88e271995c3bae34b565bdcc25ae02885 Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Mon, 13 Sep 2021 21:16:58 +0200
Subject: [PATCH] cleanup authentication credentials for OpenVPN

---
 .../common/templates/addons/vpn/openvpn/_container.tpl    | 6 +-----
 templates/questions/addons.yaml                           | 8 ++------
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/charts/library/common/templates/addons/vpn/openvpn/_container.tpl b/charts/library/common/templates/addons/vpn/openvpn/_container.tpl
index 06baaa467cc..49aaea17d78 100644
--- a/charts/library/common/templates/addons/vpn/openvpn/_container.tpl
+++ b/charts/library/common/templates/addons/vpn/openvpn/_container.tpl
@@ -28,14 +28,10 @@ env:
     value: {{ $v | quote }}
 {{- end }}
 {{- end }}
-{{- if or .Values.addons.vpn.openvpn.auth .Values.addons.vpn.openvpn.authSecret }}
+{{- if or .Values.addons.vpn.openvpn.auth }}
 envFrom:
   - secretRef:
-    {{- if .Values.addons.vpn.openvpn.authSecret }}
-      name: {{ .Values.addons.vpn.openvpn.authSecret }}
-    {{- else }}
       name: {{ include "common.names.fullname" . }}-openvpn
-    {{- end }}
 {{- end }}
 volumeMounts:
   - mountPath: {{ .Values.persistence.shared.mountPath }}
diff --git a/templates/questions/addons.yaml b/templates/questions/addons.yaml
index fca1d2ccfd0..ed96295c612 100644
--- a/templates/questions/addons.yaml
+++ b/templates/questions/addons.yaml
@@ -29,12 +29,8 @@
                   show_if: [["type", "=", "openvpn"]]
                   attrs:
                     - variable: auth
-                      label: "auth"
-                      schema:
-                        type: string
-                        default: ""
-                    - variable: authSecret
-                      label: "authSecret"
+                      label: "authentication credentials"
+                      description: "authentication credentials, seperated by ;  example: username;password"
                       schema:
                         type: string
                         default: ""