From c6eb251e233fcb47b8df31887d7db762f054c141 Mon Sep 17 00:00:00 2001
From: Kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Sun, 16 Apr 2023 13:28:15 +0200
Subject: [PATCH] more vpn fixes

---
 .../templates/addons/vpn/_gluetunContainer.tpl     |  8 ++++----
 .../templates/addons/vpn/_openvpnContainer.tpl     | 14 +++++++-------
 .../templates/addons/vpn/_wireguardContainer.tpl   | 10 +++++-----
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/library/common/templates/addons/vpn/_gluetunContainer.tpl b/library/common/templates/addons/vpn/_gluetunContainer.tpl
index 09a7071f..47602456 100644
--- a/library/common/templates/addons/vpn/_gluetunContainer.tpl
+++ b/library/common/templates/addons/vpn/_gluetunContainer.tpl
@@ -31,16 +31,16 @@ securityContext:
 env:
   DNS_KEEP_NAMESERVER: on
   DOT: off
-{{- if .Values.addons.vpn.killSwitch }}
+{{- if $.Values.addons.vpn.killSwitch }}
   FIREWALL: "on"
   {{- $excludednetworksv4 := "172.16.0.0/12" -}}
-  {{- range .Values.addons.vpn.excludedNetworks_IPv4 -}}
+  {{- range $.Values.addons.vpn.excludedNetworks_IPv4 -}}
     {{- $excludednetworksv4 = ( printf "%v,%v" $excludednetworksv4 . ) -}}
   {{- end }}
 
-{{- if .Values.addons.vpn.excludedNetworks_IPv6 -}}
+{{- if $.Values.addons.vpn.excludedNetworks_IPv6 -}}
   {{- $excludednetworksv6 := "" -}}
-  {{- range .Values.addons.vpn.excludedNetworks_IPv4 -}}
+  {{- range $.Values.addons.vpn.excludedNetworks_IPv4 -}}
     {{- $excludednetworksv6 = ( printf "%v,%v" $excludednetworksv6 . ) -}}
   {{- end }}
   FIREWALL_OUTBOUND_SUBNETS: {{ ( printf "%v,%v" $excludednetworksv4 $excludednetworksv6 ) | quote }}
diff --git a/library/common/templates/addons/vpn/_openvpnContainer.tpl b/library/common/templates/addons/vpn/_openvpnContainer.tpl
index 04f58b01..8b7fa7da 100644
--- a/library/common/templates/addons/vpn/_openvpnContainer.tpl
+++ b/library/common/templates/addons/vpn/_openvpnContainer.tpl
@@ -30,21 +30,21 @@ env:
 {{- with $.Values.addons.vpn.env }}
   {{- . | toYaml | nindent 2 }}
 {{- end }}
-  {{- if and .Values.addons.vpn.openvpn.username .Values.addons.vpn.openvpn.password }}
-  VPN_AUTH: {{ (printf "%v;%v" .Values.addons.vpn.openvpn.username .Values.addons.vpn.openvpn.password) }}
+  {{- if and $.Values.addons.vpn.openvpn.username $.Values.addons.vpn.openvpn.password }}
+  VPN_AUTH: {{ (printf "%v;%v" $.Values.addons.vpn.openvpn.username $.Values.addons.vpn.openvpn.password) }}
   {{- end -}}
-{{- if .Values.addons.vpn.killSwitch }}
+{{- if $.Values.addons.vpn.killSwitch }}
   FIREWALL: "ON"
   ROUTE_1: "172.16.0.0/12"
-  {{- range $index, $value := .Values.addons.vpn.excludedNetworks_IPv4 }}
+  {{- range $index, $value := $.Values.addons.vpn.excludedNetworks_IPv4 }}
   ROUTE_{{ add $index 2 }}: {{ $value | quote }}
   {{- end -}}
-{{- if .Values.addons.vpn.excludedNetworks_IPv6 }}
+{{- if $.Values.addons.vpn.excludedNetworks_IPv6 }}
   {{- $excludednetworksv6 := "" -}}
-  {{- range .Values.addons.vpn.excludedNetworks_IPv4 -}}
+  {{- range $.Values.addons.vpn.excludedNetworks_IPv4 -}}
     {{- $excludednetworksv6 = ( printf "%v;%v" $excludednetworksv6 . ) -}}
   {{- end -}}
-  {{- range $index, $value := .Values.addons.vpn.excludedNetworks_IPv6 }}
+  {{- range $index, $value := $.Values.addons.vpn.excludedNetworks_IPv6 }}
   ROUTE6_{{ add $index 1 }}: {{ $value | quote }}
   {{- end -}}
 {{- end -}}
diff --git a/library/common/templates/addons/vpn/_wireguardContainer.tpl b/library/common/templates/addons/vpn/_wireguardContainer.tpl
index 7ae3752a..8604b11b 100644
--- a/library/common/templates/addons/vpn/_wireguardContainer.tpl
+++ b/library/common/templates/addons/vpn/_wireguardContainer.tpl
@@ -35,19 +35,19 @@ env:
 {{- end }}
   SEPARATOR: ";"
   IPTABLES_BACKEND: "nft"
-{{- if .Values.addons.vpn.killSwitch }}
+{{- if $.Values.addons.vpn.killSwitch }}
   KILLSWITCH: "true"
   {{- $excludednetworksv4 := "172.16.0.0/12" -}}
-  {{- range .Values.addons.vpn.excludedNetworks_IPv4 -}}
+  {{- range $.Values.addons.vpn.excludedNetworks_IPv4 -}}
     {{- $excludednetworksv4 = ( printf "%v;%v" $excludednetworksv4 . ) -}}
   {{- end }}
   KILLSWITCH_EXCLUDEDNETWORKS_IPV4: {{ $excludednetworksv4 | quote }}
-{{- if .Values.addons.vpn.excludedNetworks_IPv6 -}}
+{{- if $.Values.addons.vpn.excludedNetworks_IPv6 -}}
   {{- $excludednetworksv6 := "" -}}
-  {{- range .Values.addons.vpn.excludedNetworks_IPv4 -}}
+  {{- range $.Values.addons.vpn.excludedNetworks_IPv4 -}}
     {{- $excludednetworksv6 = ( printf "%v;%v" $excludednetworksv6 . ) -}}
   {{- end }}
-  KILLSWITCH_EXCLUDEDNETWORKS_IPV6: {{ .Values.addons.vpn.excludedNetworks_IPv6 | quote }}
+  KILLSWITCH_EXCLUDEDNETWORKS_IPV6: {{ $.Values.addons.vpn.excludedNetworks_IPv6 | quote }}
 {{- end -}}
 {{- end -}}