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