From f779eb5de7a28b22ef7e1aa8dd1d645fecd113aa Mon Sep 17 00:00:00 2001
From: Kjeld Schouten <info@kjeldschouten.nl>
Date: Sun, 1 Feb 2026 15:04:24 +0100
Subject: [PATCH] chore(common): update helm/k3s versions on tests (#44421)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

**Description**

- The k3s minimum test was not matching minimum supported
- The helm tests did not include version 4 yet

**⚙️ Type of change**

- [ ] ⚙️ Feature/App addition
- [ ] 🪛 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._
---
 .github/workflows/common-tests.yaml | 31 +++++++++++++++++++++--------
 charts/library/common/Chart.yaml    |  2 +-
 2 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/common-tests.yaml b/.github/workflows/common-tests.yaml
index f6c9324eea2..5a0a5ef49df 100644
--- a/.github/workflows/common-tests.yaml
+++ b/.github/workflows/common-tests.yaml
@@ -49,7 +49,8 @@ jobs:
       matrix:
         helm-version:
           - v3.14.0
-          - v3.18.6
+          - v3.20.0
+          - v4.1.0
     steps:
       - name: Checkout
         uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
@@ -82,13 +83,14 @@ jobs:
     name: Unit Tests
     runs-on: ubuntu-24.04
     env:
-      helmUnitVersion: 0.8.1
+      helmUnitVersion: 1.0.3
     strategy:
       fail-fast: false
       matrix:
         helm-version:
           - v3.14.0
-          - v3.18.6
+          - v3.20.0
+          - v4.1.0
     steps:
       - name: Checkout
         uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
@@ -113,7 +115,19 @@ jobs:
       - name: Run Unittests
         shell: bash
         run: |
-          (helm unittest -h > /dev/null) || helm plugin install https://github.com/helm-unittest/helm-unittest --version v${helmUnitVersion} || (sleep 10 && helm plugin install https://github.com/helm-unittest/helm-unittest --version v${helmUnitVersion}) || echo "finished unittest reinstall tries"
+          set -x
+          helm_ver=${{ matrix.helm-version}}
+          helm_ver="${helm_ver#v}"
+
+          VERIFY_FLAG=""
+          if [ "$(printf '%s\n' "4.0.0" "$helm_ver" | sort -V | head -n1)" = "4.0.0" ]; then
+            VERIFY_FLAG="--verify=false"
+          fi
+
+          (helm unittest -h > /dev/null) || \
+            helm plugin install https://github.com/helm-unittest/helm-unittest --version=v${helmUnitVersion} $VERIFY_FLAG || \
+            (sleep 10 && helm plugin install https://github.com/helm-unittest/helm-unittest --version=v${helmUnitVersion} $VERIFY_FLAG) || \
+            echo "finished unittest reinstall tries"
 
           # Run tests
           cd charts/library/common-test/
@@ -128,15 +142,16 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        # We test the latest k3s version and the lowest supported by either the oldest supported SCALE or FluxCD release
+        # We test the latest k3s version and the lowest supported
         k3s-version:
           - v1.27
-          - v1.32
+          - v1.35
           - latest
-        # We test the latest k3s version and the lowest supported by either the oldest supported SCALE or FluxCD release
+        # We test the latest helm version and the lowest supported
         helm-version:
           - v3.14.0
-          - v3.18.6
+          - v3.20.0
+          - v4.1.0
         values:
           - basic-values.yaml
           - configmap-values.yaml
diff --git a/charts/library/common/Chart.yaml b/charts/library/common/Chart.yaml
index c11b24d805e..a770a99ea26 100644
--- a/charts/library/common/Chart.yaml
+++ b/charts/library/common/Chart.yaml
@@ -56,4 +56,4 @@ sources:
   - https://github.com/trueforge-org/truecharts/tree/master/charts/library/common
   - https://hub.docker.com/_/
 type: library
-version: 28.29.47
+version: 28.29.48