Skip to content

Commit 973c1c9

Browse files
authored
Merge pull request #11526 from strongjz/k8s-1.30
add k8s 1.30 to ci build
2 parents 60ea35c + e434652 commit 973c1c9

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

.github/workflows/ci.yaml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ jobs:
7474
runs-on: ubuntu-latest
7575
needs: changes
7676
if: |
77-
(needs.changes.outputs.go == 'true')
77+
(needs.changes.outputs.go == 'true') || ${{ github.event.workflow_dispatch.run_e2e == 'true' }}
7878
steps:
7979
- name: Checkout
8080
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
@@ -99,7 +99,7 @@ jobs:
9999
outputs:
100100
golangversion: ${{ steps.golangversion.outputs.version }}
101101
if: |
102-
(needs.changes.outputs.go == 'true') || (needs.changes.outputs.charts == 'true') || (needs.changes.outputs.baseimage == 'true')
102+
(needs.changes.outputs.go == 'true') || (needs.changes.outputs.charts == 'true') || (needs.changes.outputs.baseimage == 'true') || ${{ github.event.workflow_dispatch.run_e2e == 'true' }}
103103
104104
env:
105105
PLATFORMS: linux/amd64
@@ -175,7 +175,7 @@ jobs:
175175
needs:
176176
- changes
177177
if: |
178-
(needs.changes.outputs.charts == 'true') || (needs.changes.outputs.baseimage == 'true')
178+
(needs.changes.outputs.charts == 'true') || (needs.changes.outputs.baseimage == 'true') || ${{ github.event.workflow_dispatch.run_e2e == 'true' }}
179179
180180
steps:
181181
- name: Checkout
@@ -231,11 +231,11 @@ jobs:
231231
- build
232232
- helm-lint
233233
if: |
234-
(needs.changes.outputs.charts == 'true') || (needs.changes.outputs.baseimage == 'true')
234+
(needs.changes.outputs.charts == 'true') || (needs.changes.outputs.baseimage == 'true') || ${{ github.event.workflow_dispatch.run_e2e == 'true' }}
235235
236236
strategy:
237237
matrix:
238-
k8s: [v1.26.14, v1.27.11, v1.28.7, v1.29.2]
238+
k8s: [v1.26.15, v1.27.13, v1.28.9, v1.29.4, v1.30.0]
239239

240240
steps:
241241
- name: Checkout
@@ -283,10 +283,10 @@ jobs:
283283
- changes
284284
- build
285285
if: |
286-
(needs.changes.outputs.go == 'true') || (needs.changes.outputs.baseimage == 'true')
286+
(needs.changes.outputs.go == 'true') || (needs.changes.outputs.baseimage == 'true') || ${{ github.event.workflow_dispatch.run_e2e == 'true' }}
287287
strategy:
288288
matrix:
289-
k8s: [v1.26.14, v1.27.11, v1.28.7, v1.29.2]
289+
k8s: [v1.26.15, v1.27.13, v1.28.9, v1.29.4, v1.30.0]
290290
uses: ./.github/workflows/zz-tmpl-k8s-e2e.yaml
291291
with:
292292
k8s-version: ${{ matrix.k8s }}
@@ -297,10 +297,10 @@ jobs:
297297
- changes
298298
- build
299299
if: |
300-
(needs.changes.outputs.go == 'true') || (needs.changes.outputs.baseimage == 'true')
300+
(needs.changes.outputs.go == 'true') || (needs.changes.outputs.baseimage == 'true') || ${{ github.event.workflow_dispatch.run_e2e == 'true' }}
301301
strategy:
302302
matrix:
303-
k8s: [v1.26.14, v1.27.11, v1.28.7, v1.29.2]
303+
k8s: [v1.26.15, v1.27.13, v1.28.9, v1.29.4, v1.30.0]
304304
uses: ./.github/workflows/zz-tmpl-k8s-e2e.yaml
305305
with:
306306
k8s-version: ${{ matrix.k8s }}
@@ -312,10 +312,10 @@ jobs:
312312
- changes
313313
- build
314314
if: |
315-
(needs.changes.outputs.go == 'true') || (needs.changes.outputs.baseimage == 'true')
315+
(needs.changes.outputs.go == 'true') || (needs.changes.outputs.baseimage == 'true') || ${{ github.event.workflow_dispatch.run_e2e == 'true' }}
316316
strategy:
317317
matrix:
318-
k8s: [v1.26.14, v1.27.11, v1.28.7, v1.29.2]
318+
k8s: [v1.26.15, v1.27.13, v1.28.9, v1.29.4, v1.30.0]
319319
uses: ./.github/workflows/zz-tmpl-k8s-e2e.yaml
320320
with:
321321
k8s-version: ${{ matrix.k8s }}

.github/workflows/images.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ jobs:
141141
(needs.changes.outputs.kube-webhook-certgen == 'true')
142142
strategy:
143143
matrix:
144-
k8s: [v1.26.14, v1.27.11, v1.28.7, v1.29.2]
144+
k8s: [v1.26.15, v1.27.13, v1.28.9, v1.29.4, v1.30.0]
145145
steps:
146146
- name: Checkout
147147
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7

0 commit comments

Comments
 (0)