From e8398eee7e361fe3ed271ec07e2fd3cfccd7e061 Mon Sep 17 00:00:00 2001
From: Kjeld Schouten <info@kjeldschouten.nl>
Date: Sat, 25 Jan 2025 16:58:06 +0100
Subject: [PATCH] more vpn work

---
 charts/library/common/templates/addons/vpn/_vpn.tpl | 12 ++++++------
 charts/library/common/values.yaml                   |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/charts/library/common/templates/addons/vpn/_vpn.tpl b/charts/library/common/templates/addons/vpn/_vpn.tpl
index b1cbcfc7d68..dd3cb0e6dde 100644
--- a/charts/library/common/templates/addons/vpn/_vpn.tpl
+++ b/charts/library/common/templates/addons/vpn/_vpn.tpl
@@ -57,28 +57,28 @@ It will include / inject the required templates based on the given values.
     {{- $container := dict -}}
     {{- $containerModify := dict -}}
     {{- if eq "gluetun" $.Values.addons.vpn.type -}}
-      {{- $container = .Values.addons.vpn.gluetun.container -}}
+      {{- $container = $.Values.addons.vpn.gluetun.container -}}
       {{- $containerModify = include "tc.v1.common.addon.vpn.gluetun.containerModify" $ | fromYaml -}}
 
     {{- else if eq "tailscale" $.Values.addons.vpn.type -}}
       {{/* FIXME: https://github.com/tailscale/tailscale/issues/8188 */}}
       {{- $_ := set $.Values.podOptions "automountServiceAccountToken" true -}}
-      {{- $container = .Values.addons.vpn.tailscale.container -}}
+      {{- $container = $.Values.addons.vpn.tailscale.container -}}
       {{- $containerModify = include "tc.v1.common.addon.vpn.tailscale.containerModify" $ | fromYaml -}}
 
     {{- else if eq "openvpn" $.Values.addons.vpn.type -}}
-      {{- $container = .Values.addons.vpn.openvpn.container -}}
+      {{- $container = $.Values.addons.vpn.openvpn.container -}}
       {{- $containerModify = include "tc.v1.common.addon.vpn.openvpn.containerModify" $ | fromYaml -}}
 
     {{- else if eq "wireguard" $.Values.addons.vpn.type -}}
-      {{- $container = .Values.addons.vpn.wireguard.container -}}
+      {{- $container = $.Values.addons.vpn.wireguard.container -}}
       {{- $containerModify = include "tc.v1.common.addon.vpn.wireguard.containerModify" $ | fromYaml -}}
 
     {{- end -}}
-    {{- if $container -}}
+    {{- if $container.enabled -}}
       {{- $mergedContainer := mustMergeOverwrite $container $containerModify -}}
       {{- $workload := get $.Values.workload . -}}
-      {{- $_ := set $workload.podSpec.containers $container $mergedContainer -}}
+      {{- $_ := set $workload.podSpec.containers "vpn" $mergedContainer -}}
     {{- end -}}
   {{- end -}}
 
diff --git a/charts/library/common/values.yaml b/charts/library/common/values.yaml
index 36531d2524b..4355979b5cc 100644
--- a/charts/library/common/values.yaml
+++ b/charts/library/common/values.yaml
@@ -835,7 +835,7 @@ addons:
   # -- The common chart supports adding a VPN add-on. It can be configured under this key.
   # @default -- See values.yaml
   vpn:
-      enabled: false
+      enabled: true
       # -- Specify the VPN type. Valid options are disabled, gluetun, openvpn, wireguard or tailscale
       # OpenVPN and Wireguard are considered deprecated
       type: disabled