Bump CI to last 3 k8s minors

Signed-off-by: Marco Franssen <[email protected]>
This commit is contained in:
Marco Franssen
2026-03-02 19:32:48 +01:00
parent 0a841c76a2
commit 50afee93c0
2 changed files with 31 additions and 26 deletions
+12 -12
View File
@@ -30,9 +30,9 @@ jobs:
strategy: strategy:
matrix: matrix:
k8s: k8s:
- v1.31.1 - v1.33.7
- v1.30.4 - v1.34.3
- v1.29.8 - v1.35.1
steps: steps:
- run: 'echo "Skipping tests"' - run: 'echo "Skipping tests"'
@@ -74,9 +74,9 @@ jobs:
strategy: strategy:
matrix: matrix:
k8s: k8s:
- v1.31.1 - v1.33.7
- v1.30.4 - v1.34.3
- v1.29.8 - v1.35.1
example: example:
- ${{ fromJson(needs.build-matrix.outputs.examples) }} - ${{ fromJson(needs.build-matrix.outputs.examples) }}
@@ -92,9 +92,9 @@ jobs:
strategy: strategy:
matrix: matrix:
k8s: k8s:
- v1.31.1 - v1.33.7
- v1.30.4 - v1.34.3
- v1.29.8 - v1.35.1
example: example:
- ${{ fromJson(needs.build-matrix.outputs.integrationtests) }} - ${{ fromJson(needs.build-matrix.outputs.integrationtests) }}
@@ -110,9 +110,9 @@ jobs:
strategy: strategy:
matrix: matrix:
k8s: k8s:
- v1.31.1 - v1.33.7
- v1.30.4 - v1.34.3
- v1.29.8 - v1.35.1
steps: steps:
- run: 'echo "Skipping upgrade-test"' - run: 'echo "Skipping upgrade-test"'
+19 -14
View File
@@ -2,6 +2,11 @@ name: Helm Chart CI
on: on:
workflow_dispatch: workflow_dispatch:
inputs:
target_branch:
description: 'Target branch to lint/test against (e.g. main, release)'
required: false
default: 'main'
pull_request: pull_request:
types: [synchronize, opened, reopened] types: [synchronize, opened, reopened]
paths: paths:
@@ -114,7 +119,7 @@ jobs:
version: ${{ env.CHART_TESTING_VERSION }} version: ${{ env.CHART_TESTING_VERSION }}
- name: Run chart-testing (lint) - name: Run chart-testing (lint)
run: TARGET_BRANCH=${{ github.base_ref }} make lint${{ github.base_ref == 'release' && '-release' || '' }} run: TARGET_BRANCH=${{ github.base_ref || inputs.target_branch }} make lint${{ (github.base_ref == 'release' || inputs.target_branch == 'release') && '-release' || '' }}
test: test:
runs-on: ubuntu-22.04 runs-on: ubuntu-22.04
@@ -130,9 +135,9 @@ jobs:
# Kubernetes, but can go back farther as long as we don't need heroics # Kubernetes, but can go back farther as long as we don't need heroics
# to pull it off (i.e. kubectl version juggling). # to pull it off (i.e. kubectl version juggling).
k8s: k8s:
- v1.31.1 - v1.33.7
- v1.30.4 - v1.34.3
- v1.29.8 - v1.35.1
steps: steps:
- name: Checkout - name: Checkout
@@ -172,7 +177,7 @@ jobs:
run: | run: |
helm install -n spire-server spire-crds charts/spire-crds helm install -n spire-server spire-crds charts/spire-crds
ct install --config ct.yaml --excluded-charts spire-crds,spiffe-step-ssh \ ct install --config ct.yaml --excluded-charts spire-crds,spiffe-step-ssh \
--target-branch ${{ github.base_ref }} --target-branch ${{ github.base_ref || inputs.target_branch }}
- name: Test summary - name: Test summary
if: always() if: always()
@@ -218,9 +223,9 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
k8s: k8s:
- v1.31.1 - v1.33.7
- v1.30.4 - v1.34.3
- v1.29.8 - v1.35.1
example: example:
- ${{ fromJson(needs.build-matrix.outputs.examples) }} - ${{ fromJson(needs.build-matrix.outputs.examples) }}
@@ -270,9 +275,9 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
k8s: k8s:
- v1.31.1 - v1.33.7
- v1.30.4 - v1.34.3
- v1.29.8 - v1.35.1
integrationtest: integrationtest:
- ${{ fromJson(needs.build-matrix.outputs.integrationtests) }} - ${{ fromJson(needs.build-matrix.outputs.integrationtests) }}
@@ -315,9 +320,9 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
k8s: k8s:
- v1.31.1 - v1.33.7
- v1.30.4 - v1.34.3
- v1.29.8 - v1.35.1
steps: steps:
- name: Checkout - name: Checkout