DevOps/truecharts
2
0
Fork 0
Code Issues Pull Requests Actions 28 Packages Projects Releases 1 Wiki Activity

(fix) simplify and correct openvpn VPN_AUTH envvar generation

Browse Source
This commit is contained in:
kjeld Schouten-Lebbing
2021-09-29 17:32:24 +02:00
parent e1ffb00eba
commit 7600caaba0
3 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
charts/library/common/Chart.yaml
+1 -1
View File
@@ -15,4 +15,4 @@ maintainers:
name: common name: common
sources: null sources: null
type: library type: library
version: 8.0.12 version: 8.0.13
charts/library/common/templates/addons/vpn/openvpn/_container.tpl
+1 -1
View File
@@ -49,7 +49,7 @@ env:
{{- end }} {{- end }}
{{- end }} {{- end }}
{{- if or .Values.addons.vpn.openvpn.auth }} {{- if or ( .Values.addons.vpn.openvpn.username ) ( .Values.addons.vpn.openvpn.password ) }}
envFrom: envFrom:
- secretRef: - secretRef:
name: {{ include "common.names.fullname" . }}-openvpn name: {{ include "common.names.fullname" . }}-openvpn
charts/library/common/templates/addons/vpn/openvpn/_secret.tpl
+1 -7
View File
@@ -10,11 +10,5 @@ metadata:
labels: labels:
{{- include "common.labels" $ | nindent 4 }} {{- include "common.labels" $ | nindent 4 }}
data: data:
{{- $vpnauth := "" }} VPN_AUTH: {{ ( printf "%v;%v" .Values.addons.vpn.openvpn.username .Values.addons.vpn.openvpn.password ) | b64enc }}
{{- 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 }}
{{- end -}} {{- end -}}