From 0970b3a8d3c076333222ac24b2dc357201c82708 Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Mon, 13 Sep 2021 09:25:38 +0200
Subject: [PATCH] fix: ensure wireguard env vars get created

---
 charts/library/common/Chart.yaml                          | 2 +-
 .../common/templates/addons/vpn/wireguard/_container.tpl  | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/charts/library/common/Chart.yaml b/charts/library/common/Chart.yaml
index be9c6c860c9..aa7534f989b 100644
--- a/charts/library/common/Chart.yaml
+++ b/charts/library/common/Chart.yaml
@@ -18,4 +18,4 @@ maintainers:
 name: common
 sources: null
 type: library
-version: 7.0.11
+version: 7.0.12
diff --git a/charts/library/common/templates/addons/vpn/wireguard/_container.tpl b/charts/library/common/templates/addons/vpn/wireguard/_container.tpl
index 2e79729f8a7..25cb0af9d5e 100644
--- a/charts/library/common/templates/addons/vpn/wireguard/_container.tpl
+++ b/charts/library/common/templates/addons/vpn/wireguard/_container.tpl
@@ -16,6 +16,8 @@ securityContext:
   {{- toYaml . | nindent 2 }}
 {{- end }}
 env:
+  - name: SEPARATOR
+    value: ";"
 {{- range $envList := .Values.addons.vpn.envList }}
   {{- if and $envList.name $envList.value }}
   - name: {{ $envList.name }}
@@ -24,13 +26,14 @@ env:
   {{- fail "Please specify name/value for VPN environment variable" }}
   {{- end }}
 {{- end}}
+
 {{- with .Values.addons.vpn.env }}
 {{- range $k, $v := . }}
   - name: {{ $k }}
     value: {{ $v | quote }}
 {{- end }}
-  - name: SEPARATOR
-    value: ";"
+{{- end }}
+
 {{- if .Values.addons.vpn.wireguard.KILLSWITCH }}
   - name: KILLSWITCH
     value: "true"
@@ -44,7 +47,6 @@ env:
 {{- end }}
 {{- end }}
 
-{{- end }}
 volumeMounts:
   - mountPath: {{ .Values.persistence.shared.mountPath }}
     name: shared