From 9ccdfcb7d89e4e03aeb1a1ade5c49d05e4b1b2e1 Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Sun, 12 Sep 2021 22:48:31 +0200
Subject: [PATCH] fix: nuke all VPN volumes that we don't use (yet) out of
 Common

---
 charts/library/common/Chart.yaml                       |  2 +-
 charts/library/common/templates/addons/vpn/_vpn.tpl    |  5 -----
 .../common/templates/addons/vpn/openvpn/_container.tpl | 10 ----------
 .../templates/addons/vpn/wireguard/_container.tpl      | 10 ----------
 4 files changed, 1 insertion(+), 26 deletions(-)

diff --git a/charts/library/common/Chart.yaml b/charts/library/common/Chart.yaml
index 59a82bd21db..be9c6c860c9 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.10
+version: 7.0.11
diff --git a/charts/library/common/templates/addons/vpn/_vpn.tpl b/charts/library/common/templates/addons/vpn/_vpn.tpl
index bf261ddc561..5b04611ec81 100644
--- a/charts/library/common/templates/addons/vpn/_vpn.tpl
+++ b/charts/library/common/templates/addons/vpn/_vpn.tpl
@@ -12,11 +12,6 @@ It will include / inject the required templates based on the given values.
     {{- include "common.addon.wireguard" . }}
   {{- end -}}
 
-  {{/* Include the configmap if not empty */}}
-  {{- $configmap := include "common.addon.vpn.configmap" . -}}
-  {{- if $configmap -}}
-    {{- $configmap | nindent 0 -}}
-  {{- end -}}
 
   {{- $_ := set .Values.persistence "vpnconfig" .Values.addons.vpn.configFile -}}
 
diff --git a/charts/library/common/templates/addons/vpn/openvpn/_container.tpl b/charts/library/common/templates/addons/vpn/openvpn/_container.tpl
index 6c92ee8f060..06baaa467cc 100644
--- a/charts/library/common/templates/addons/vpn/openvpn/_container.tpl
+++ b/charts/library/common/templates/addons/vpn/openvpn/_container.tpl
@@ -44,16 +44,6 @@ volumeMounts:
   - name: vpnconfig
     mountPath: /vpn/vpn.conf
 {{- end }}
-{{- if .Values.addons.vpn.scripts.up }}
-  - name: vpnscript
-    mountPath: /vpn/up.sh
-    subPath: up.sh
-{{- end }}
-{{- if .Values.addons.vpn.scripts.down }}
-  - name: vpnscript
-    mountPath: /vpn/down.sh
-    subPath: down.sh
-{{- end }}
 {{- with .Values.addons.vpn.livenessProbe }}
 livenessProbe:
   {{- toYaml . | nindent 2 }}
diff --git a/charts/library/common/templates/addons/vpn/wireguard/_container.tpl b/charts/library/common/templates/addons/vpn/wireguard/_container.tpl
index ec4dd14cdc7..2e79729f8a7 100644
--- a/charts/library/common/templates/addons/vpn/wireguard/_container.tpl
+++ b/charts/library/common/templates/addons/vpn/wireguard/_container.tpl
@@ -52,16 +52,6 @@ volumeMounts:
   - name: vpnconfig
     mountPath: /etc/wireguard/wg0.conf
 {{- end }}
-{{- if .Values.addons.vpn.scripts.up }}
-  - name: vpnscript
-    mountPath: /config/up.sh
-    subPath: up.sh
-{{- end }}
-{{- if .Values.addons.vpn.scripts.down }}
-  - name: vpnscript
-    mountPath: /config/down.sh
-    subPath: down.sh
-{{- end }}
 {{- with .Values.addons.vpn.livenessProbe }}
 livenessProbe:
   {{- toYaml . | nindent 2 }}