From cf410c320a8640292f426fb56e17477d8fe07197 Mon Sep 17 00:00:00 2001
From: Kjeld Schouten <info@kjeldschouten.nl>
Date: Wed, 9 Apr 2025 21:22:51 +0200
Subject: [PATCH] feat(common): Prevent update with old VPN addons set (#33989)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

**Description**
We want to ensure users dont accidentally update with old vpn addon
structure set.
This update fails any helm attempts using the old vpn addons

⚒️ Fixes  #33005

**⚙️ Type of change**

- [ ] ⚙️ Feature/App addition
- [x] 🪛 Bugfix
- [ ] ⚠️ Breaking change (fix or feature that would cause existing
functionality to not work as expected)
- [ ] 🔃 Refactor of current code
- [ ] 📜 Documentation Changes

**🧪 How Has This Been Tested?**
<!--
Please describe the tests that you ran to verify your changes. Provide
instructions so we can reproduce. Please also list any relevant details
for your test configuration
-->

**📃 Notes:**
<!-- Please enter any other relevant information here -->

**✔️ Checklist:**

- [ ] ⚖️ My code follows the style guidelines of this project
- [ ] 👀 I have performed a self-review of my own code
- [ ] #️⃣ I have commented my code, particularly in hard-to-understand
areas
- [ ] 📄 I have made changes to the documentation
- [ ] 🧪 I have added tests to this description that prove my fix is
effective or that my feature works
- [ ] ⬆️ I increased versions for any altered app according to semantic
versioning
- [ ] I made sure the title starts with `feat(chart-name):`,
`fix(chart-name):`, `chore(chart-name):`, `docs(chart-name):` or
`fix(docs):`

**➕ App addition**

If this PR is an app addition please make sure you have done the
following.

- [ ] 🖼️ I have added an icon in the Chart's root directory called
`icon.png`

---

_Please don't blindly check all the boxes. Read them and only check
those that apply.
Those checkboxes are there for the reviewer to see what is this all
about and
the status of this PR with a quick glance._

---------

Signed-off-by: Kjeld Schouten <info@kjeldschouten.nl>
---
 charts/library/common/Chart.yaml                     | 2 +-
 charts/library/common/templates/values/_validate.tpl | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/charts/library/common/Chart.yaml b/charts/library/common/Chart.yaml
index 35ef911c9b8..f99dbfd1a50 100644
--- a/charts/library/common/Chart.yaml
+++ b/charts/library/common/Chart.yaml
@@ -48,4 +48,4 @@ sources:
   - https://hub.docker.com/_/
   - https://hub.docker.com/r/mikefarah/yq
 type: library
-version: 28.0.0
+version: 28.1.0
diff --git a/charts/library/common/templates/values/_validate.tpl b/charts/library/common/templates/values/_validate.tpl
index d4c52c596b3..3d4f7a13f02 100644
--- a/charts/library/common/templates/values/_validate.tpl
+++ b/charts/library/common/templates/values/_validate.tpl
@@ -22,4 +22,11 @@
     ) -}}
   {{- end -}}
 
+  {{/* Catch update related issues */}}
+    {{- if .addons -}}
+  {{- if .addons.vpn -}}
+    {{- fail (printf "Your current Common-Chart version does not support [.Values.addons.vpn] please use [.Values.addons.tailscale] or [.Values.addons.gluetun] instead") }}
+  {{- end -}}
+  {{- end -}}
+
 {{- end -}}