From b2e056d490340cc812a354a93757b7ac692b7cee Mon Sep 17 00:00:00 2001 From: James Strong Date: Mon, 1 Jul 2024 11:24:18 -0400 Subject: [PATCH 1/4] add k8s 1.30 to ci build Signed-off-by: James Strong --- .github/workflows/ci.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index a2e036f72f..0d6a8b9848 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -235,7 +235,7 @@ jobs: strategy: matrix: - k8s: [v1.26.14, v1.27.11, v1.28.7, v1.29.2] + k8s: [v1.26.15, v1.27.13, v1.28.9, v1.29.4, v1.30] steps: - name: Checkout @@ -286,7 +286,7 @@ jobs: (needs.changes.outputs.go == 'true') || (needs.changes.outputs.baseimage == 'true') strategy: matrix: - k8s: [v1.26.14, v1.27.11, v1.28.7, v1.29.2] + k8s: [v1.26.15, v1.27.13, v1.28.9, v1.29.4, v1.30] uses: ./.github/workflows/zz-tmpl-k8s-e2e.yaml with: k8s-version: ${{ matrix.k8s }} @@ -300,7 +300,7 @@ jobs: (needs.changes.outputs.go == 'true') || (needs.changes.outputs.baseimage == 'true') strategy: matrix: - k8s: [v1.26.14, v1.27.11, v1.28.7, v1.29.2] + k8s: [v1.26.15, v1.27.13, v1.28.9, v1.29.4, v1.30] uses: ./.github/workflows/zz-tmpl-k8s-e2e.yaml with: k8s-version: ${{ matrix.k8s }} @@ -315,7 +315,7 @@ jobs: (needs.changes.outputs.go == 'true') || (needs.changes.outputs.baseimage == 'true') strategy: matrix: - k8s: [v1.26.14, v1.27.11, v1.28.7, v1.29.2] + k8s: [v1.26.15, v1.27.13, v1.28.9, v1.29.4, v1.30] uses: ./.github/workflows/zz-tmpl-k8s-e2e.yaml with: k8s-version: ${{ matrix.k8s }} From d23241bac040acec5e783c2f89bdc93622781b3a Mon Sep 17 00:00:00 2001 From: James Strong Date: Mon, 1 Jul 2024 11:37:55 -0400 Subject: [PATCH 2/4] force all ci to run on workflow dispatch Signed-off-by: James Strong --- .github/workflows/ci.yaml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 0d6a8b9848..b7e79a5f84 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -74,7 +74,7 @@ jobs: runs-on: ubuntu-latest needs: changes if: | - (needs.changes.outputs.go == 'true') + (needs.changes.outputs.go == 'true') || ${{ github.event.workflow_dispatch.run_e2e == 'true' }} steps: - name: Checkout uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 @@ -99,7 +99,7 @@ jobs: outputs: golangversion: ${{ steps.golangversion.outputs.version }} if: | - (needs.changes.outputs.go == 'true') || (needs.changes.outputs.charts == 'true') || (needs.changes.outputs.baseimage == 'true') + (needs.changes.outputs.go == 'true') || (needs.changes.outputs.charts == 'true') || (needs.changes.outputs.baseimage == 'true') || ${{ github.event.workflow_dispatch.run_e2e == 'true' }} env: PLATFORMS: linux/amd64 @@ -175,7 +175,7 @@ jobs: needs: - changes if: | - (needs.changes.outputs.charts == 'true') || (needs.changes.outputs.baseimage == 'true') + (needs.changes.outputs.charts == 'true') || (needs.changes.outputs.baseimage == 'true') || ${{ github.event.workflow_dispatch.run_e2e == 'true' }} steps: - name: Checkout @@ -231,7 +231,7 @@ jobs: - build - helm-lint if: | - (needs.changes.outputs.charts == 'true') || (needs.changes.outputs.baseimage == 'true') + (needs.changes.outputs.charts == 'true') || (needs.changes.outputs.baseimage == 'true') || ${{ github.event.workflow_dispatch.run_e2e == 'true' }} strategy: matrix: @@ -283,7 +283,7 @@ jobs: - changes - build if: | - (needs.changes.outputs.go == 'true') || (needs.changes.outputs.baseimage == 'true') + (needs.changes.outputs.go == 'true') || (needs.changes.outputs.baseimage == 'true') || ${{ github.event.workflow_dispatch.run_e2e == 'true' }} strategy: matrix: k8s: [v1.26.15, v1.27.13, v1.28.9, v1.29.4, v1.30] @@ -297,8 +297,8 @@ jobs: - changes - build if: | - (needs.changes.outputs.go == 'true') || (needs.changes.outputs.baseimage == 'true') - strategy: + (needs.changes.outputs.go == 'true') || (needs.changes.outputs.baseimage == 'true') || ${{ github.event.workflow_dispatch.run_e2e == 'true' }} + strategy: matrix: k8s: [v1.26.15, v1.27.13, v1.28.9, v1.29.4, v1.30] uses: ./.github/workflows/zz-tmpl-k8s-e2e.yaml @@ -312,7 +312,7 @@ jobs: - changes - build if: | - (needs.changes.outputs.go == 'true') || (needs.changes.outputs.baseimage == 'true') + (needs.changes.outputs.go == 'true') || (needs.changes.outputs.baseimage == 'true') || ${{ github.event.workflow_dispatch.run_e2e == 'true' }} strategy: matrix: k8s: [v1.26.15, v1.27.13, v1.28.9, v1.29.4, v1.30] From e644c691b56ba187caa128464ccf786ae031da69 Mon Sep 17 00:00:00 2001 From: James Strong Date: Wed, 3 Jul 2024 12:04:16 -0400 Subject: [PATCH 3/4] correct the 1.30 version Signed-off-by: James Strong --- .github/workflows/ci.yaml | 8 ++++---- .github/workflows/images.yaml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index b7e79a5f84..50b095ff82 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -235,7 +235,7 @@ jobs: strategy: matrix: - k8s: [v1.26.15, v1.27.13, v1.28.9, v1.29.4, v1.30] + k8s: [v1.26.15, v1.27.13, v1.28.9, v1.29.4, v1.30.0] steps: - name: Checkout @@ -286,7 +286,7 @@ jobs: (needs.changes.outputs.go == 'true') || (needs.changes.outputs.baseimage == 'true') || ${{ github.event.workflow_dispatch.run_e2e == 'true' }} strategy: matrix: - k8s: [v1.26.15, v1.27.13, v1.28.9, v1.29.4, v1.30] + k8s: [v1.26.15, v1.27.13, v1.28.9, v1.29.4, v1.30.0] uses: ./.github/workflows/zz-tmpl-k8s-e2e.yaml with: k8s-version: ${{ matrix.k8s }} @@ -300,7 +300,7 @@ jobs: (needs.changes.outputs.go == 'true') || (needs.changes.outputs.baseimage == 'true') || ${{ github.event.workflow_dispatch.run_e2e == 'true' }} strategy: matrix: - k8s: [v1.26.15, v1.27.13, v1.28.9, v1.29.4, v1.30] + k8s: [v1.26.15, v1.27.13, v1.28.9, v1.29.4, v1.30.0] uses: ./.github/workflows/zz-tmpl-k8s-e2e.yaml with: k8s-version: ${{ matrix.k8s }} @@ -315,7 +315,7 @@ jobs: (needs.changes.outputs.go == 'true') || (needs.changes.outputs.baseimage == 'true') || ${{ github.event.workflow_dispatch.run_e2e == 'true' }} strategy: matrix: - k8s: [v1.26.15, v1.27.13, v1.28.9, v1.29.4, v1.30] + k8s: [v1.26.15, v1.27.13, v1.28.9, v1.29.4, v1.30.0] uses: ./.github/workflows/zz-tmpl-k8s-e2e.yaml with: k8s-version: ${{ matrix.k8s }} diff --git a/.github/workflows/images.yaml b/.github/workflows/images.yaml index 4aed947728..ec0f1af780 100644 --- a/.github/workflows/images.yaml +++ b/.github/workflows/images.yaml @@ -141,7 +141,7 @@ jobs: (needs.changes.outputs.kube-webhook-certgen == 'true') strategy: matrix: - k8s: [v1.26.14, v1.27.11, v1.28.7, v1.29.2] + k8s: [v1.26.15, v1.27.13, v1.28.9, v1.29.4, v1.30.0] steps: - name: Checkout uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 From 8a19355f0ea81ff6133df652a7ad9318fdc35232 Mon Sep 17 00:00:00 2001 From: James Strong Date: Wed, 3 Jul 2024 14:32:49 -0400 Subject: [PATCH 4/4] Update .github/workflows/ci.yaml Co-authored-by: Marco Ebert --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 50b095ff82..fcfe144f88 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -298,7 +298,7 @@ jobs: - build if: | (needs.changes.outputs.go == 'true') || (needs.changes.outputs.baseimage == 'true') || ${{ github.event.workflow_dispatch.run_e2e == 'true' }} - strategy: + strategy: matrix: k8s: [v1.26.15, v1.27.13, v1.28.9, v1.29.4, v1.30.0] uses: ./.github/workflows/zz-tmpl-k8s-e2e.yaml