Skip to content

Commit 86e851b

Browse files
committed
adjust based on kind 0.25
1 parent 8300119 commit 86e851b

File tree

2 files changed

+25
-29
lines changed

2 files changed

+25
-29
lines changed

.github/workflows/acceptance_tests_kind.yaml

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -42,25 +42,23 @@ jobs:
4242
matrix:
4343
kubernetes_version:
4444
# kind images: https://github.com/kubernetes-sigs/kind/releases (note the images are kind release specific)
45-
- v1.31.2@sha256:33034c0a75dd82b2f2f22bdf0a30ea2a42b2c3547a6d56c52c7ea9c1b5fb89b9
46-
- v1.30.0@sha256:047357ac0cfea04663786a612ba1eaba9702bef25227a794b52890dd8bcd692e
47-
- v1.29.0@sha256:eaa1450915475849a73a9227b8f201df25e55e268e5d619312131292e324d570
48-
- v1.28.0@sha256:b7a4cad12c197af3ba43202d3efe03246b3f0793f162afb40a33c923952d5b31
49-
- v1.27.3@sha256:3966ac761ae0136263ffdb6cfd4db23ef8a83cba8a463690e98317add2c9ba72
45+
- v1.30.6@sha256:b6d08db72079ba5ae1f4a88a09025c0a904af3b52387643c285442afb05ab994
46+
- v1.29.10@sha256:3b2d8c31753e6c8069d4fc4517264cd20e86fd36220671fb7d0a5855103aa84b
47+
- v1.28.15@sha256:a7c05c7ae043a0b8c818f5a06188bc2c4098f6cb59ca7d1856df00375d839251
48+
- v1.27.16@sha256:2d21a61643eafc439905e18705b8186f3296384750a835ad7a005dceb9546d20
5049
- v1.26.6@sha256:6e2d8b28a5b601defe327b98bd1c2d1930b49e5d8c512e1895099e4504007adb
51-
- v1.25.11@sha256:227fa11ce74ea76a0474eeefb84cb75d8dad1b08638371ecf0e86259b35be0c8
52-
- v1.23.17@sha256:59c989ff8a517a93127d4a536e7014d28e235fb3529d9fba91b3951d461edfdb
53-
isMain:
54-
- ${{ contains(github.ref, 'main') }}
50+
- v1.26.15@sha256:c79602a44b4056d7e48dc20f7504350f1e87530fe953428b792def00bc1076dd
51+
isMajorReleaseBranch:
52+
- ${{ contains(github.ref, 'v3-major-release') }}
5553
isBaseMajorRelease:
5654
- ${{ contains(github.base_ref, 'v3-major-release') }}
57-
exclude:
58-
# Exclude if reference is main and base reference is not v3-major-release
59-
- isMain: true
55+
include:
56+
# include if reference is v3-major-release and base reference is not v3-major-release
57+
- isMajorReleaseBranch: true
6058
isBaseMajorRelease: false
6159
kubernetes_version: v1.31.2@sha256:33034c0a75dd82b2f2f22bdf0a30ea2a42b2c3547a6d56c52c7ea9c1b5fb89b9
62-
# Exclude if reference is not main and base reference is v3-major-release
63-
- isMain: false
60+
# include if reference is not v3-major-release and base reference is v3-major-release
61+
- isMajorReleaseBranch: false
6462
isBaseMajorRelease: true
6563
kubernetes_version: v1.31.2@sha256:33034c0a75dd82b2f2f22bdf0a30ea2a42b2c3547a6d56c52c7ea9c1b5fb89b9
6664
steps:

.github/workflows/manifest_acc.yaml

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -30,25 +30,23 @@ jobs:
3030
matrix:
3131
kubernetes_version:
3232
# kind images: https://github.com/kubernetes-sigs/kind/releases (note the images are kind release specific)
33-
- v1.31.2@sha256:33034c0a75dd82b2f2f22bdf0a30ea2a42b2c3547a6d56c52c7ea9c1b5fb89b9
34-
- v1.30.0@sha256:047357ac0cfea04663786a612ba1eaba9702bef25227a794b52890dd8bcd692e
35-
- v1.29.0@sha256:eaa1450915475849a73a9227b8f201df25e55e268e5d619312131292e324d570
36-
- v1.28.0@sha256:b7a4cad12c197af3ba43202d3efe03246b3f0793f162afb40a33c923952d5b31
37-
- v1.27.3@sha256:3966ac761ae0136263ffdb6cfd4db23ef8a83cba8a463690e98317add2c9ba72
33+
- v1.30.6@sha256:b6d08db72079ba5ae1f4a88a09025c0a904af3b52387643c285442afb05ab994
34+
- v1.29.10@sha256:3b2d8c31753e6c8069d4fc4517264cd20e86fd36220671fb7d0a5855103aa84b
35+
- v1.28.15@sha256:a7c05c7ae043a0b8c818f5a06188bc2c4098f6cb59ca7d1856df00375d839251
36+
- v1.27.16@sha256:2d21a61643eafc439905e18705b8186f3296384750a835ad7a005dceb9546d20
3837
- v1.26.6@sha256:6e2d8b28a5b601defe327b98bd1c2d1930b49e5d8c512e1895099e4504007adb
39-
- v1.25.11@sha256:227fa11ce74ea76a0474eeefb84cb75d8dad1b08638371ecf0e86259b35be0c8
40-
- v1.23.17@sha256:59c989ff8a517a93127d4a536e7014d28e235fb3529d9fba91b3951d461edfdb
41-
isMain:
42-
- ${{ contains(github.ref, 'main') }}
38+
- v1.26.15@sha256:c79602a44b4056d7e48dc20f7504350f1e87530fe953428b792def00bc1076dd
39+
isMajorReleaseBranch:
40+
- ${{ contains(github.ref, 'v3-major-release') }}
4341
isBaseMajorRelease:
4442
- ${{ contains(github.base_ref, 'v3-major-release') }}
45-
exclude:
46-
# Exclude if reference is main and base reference is not v3-major-release
47-
- isMain: true
43+
include:
44+
# include if reference is v3-major-release and base reference is not v3-major-release
45+
- isMajorReleaseBranch: true
4846
isBaseMajorRelease: false
4947
kubernetes_version: v1.31.2@sha256:33034c0a75dd82b2f2f22bdf0a30ea2a42b2c3547a6d56c52c7ea9c1b5fb89b9
50-
# Exclude if reference is not main and base reference is v3-major-release
51-
- isMain: false
48+
# include if reference is not v3-major-release and base reference is v3-major-release
49+
- isMajorReleaseBranch: false
5250
isBaseMajorRelease: true
5351
kubernetes_version: v1.31.2@sha256:33034c0a75dd82b2f2f22bdf0a30ea2a42b2c3547a6d56c52c7ea9c1b5fb89b9
5452
terraform_version:
@@ -71,7 +69,7 @@ jobs:
7169
- name: Setup kind
7270
uses: helm/kind-action@0025e74a8c7512023d06dc019c617aa3cf561fde # v1.10.0
7371
with:
74-
version: v0.21.0
72+
version: v0.25.0
7573
node_image: kindest/node:${{ matrix.kubernetes_version }}
7674
# By default, this action creates a cluster with the name 'chart-testing'
7775
cluster_name: manifest

0 commit comments

Comments
 (0)