Skip to content

Commit a865360

Browse files
author
Mikołaj Świątek
authored
Explicitly set kind version when running tests in CI (#1864)
* Upgrade kuttl to 0.15.0 * Update kind images for kind 0.20.0 * Use older kind version for older k8s versions
1 parent fa611d0 commit a865360

12 files changed

+29
-11
lines changed

.github/workflows/e2e.yaml

+10-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ concurrency:
1010
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
1111
cancel-in-progress: true
1212

13+
env:
14+
CURRENT_KIND_VERSION: 0.20.0
15+
LEGACY_KIND_VERSION: 0.17.0 # for K8s versions latest kind doesn't support anymore
16+
1317
jobs:
1418
e2e-tests:
1519
name: End-to-end tests
@@ -28,12 +32,17 @@ jobs:
2832
- e2e-autoscale
2933

3034
steps:
31-
35+
3236
- name: Set up Go
3337
uses: actions/setup-go@v4
3438
with:
3539
go-version: "1.20"
3640

41+
- name: Setup kind
42+
env:
43+
KIND_VERSION: ${{ matrix.kube_version >= 1.21 && env.KIND_VERSION || env.LEGACY_KIND_VERSION }}
44+
run: go install sigs.k8s.io/kind@v${KIND_VERSION}
45+
3746
- name: Check out code into the Go module directory
3847
uses: actions/checkout@v3
3948

.github/workflows/scorecard.yaml

+9
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ concurrency:
1010
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
1111
cancel-in-progress: true
1212

13+
env:
14+
CURRENT_KIND_VERSION: 0.20.0
15+
LEGACY_KIND_VERSION: 0.17.0 # for K8s versions latest kind doesn't support anymore
16+
1317
jobs:
1418
scorecard-tests:
1519
name: test on k8s
@@ -27,6 +31,11 @@ jobs:
2731
with:
2832
go-version: "1.20"
2933

34+
- name: Setup kind
35+
env:
36+
KIND_VERSION: ${{ matrix.kube_version >= 1.21 && env.KIND_VERSION || env.LEGACY_KIND_VERSION }}
37+
run: go install sigs.k8s.io/kind@v${KIND_VERSION}
38+
3039
- name: Check out code into the Go module directory
3140
uses: actions/checkout@v3
3241

hack/install-kuttl.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
22

3-
sudo curl -Lo /usr/local/bin/kubectl-kuttl https://github.com/kudobuilder/kuttl/releases/download/v0.12.1/kubectl-kuttl_0.12.1_linux_x86_64
3+
sudo curl -Lo /usr/local/bin/kubectl-kuttl https://github.com/kudobuilder/kuttl/releases/download/v0.15.0/kubectl-kuttl_0.15.0_linux_x86_64
44
sudo chmod +x /usr/local/bin/kubectl-kuttl
55
export PATH=$PATH:/usr/local/bin

kind-1.19.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ kind: Cluster
22
apiVersion: kind.x-k8s.io/v1alpha4
33
nodes:
44
- role: control-plane
5-
image: kindest/node:v1.19.16@sha256:707469aac7e6805e52c3bde2a8a8050ce2b15decff60db6c5077ba9975d28b98
5+
image: kindest/node:v1.19.16@sha256:476cb3269232888437b61deca013832fee41f9f074f9bed79f57e4280f7c48b7

kind-1.20.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ kind: Cluster
22
apiVersion: kind.x-k8s.io/v1alpha4
33
nodes:
44
- role: control-plane
5-
image: kindest/node:v1.20.15@sha256:d67de8f84143adebe80a07672f370365ec7d23f93dc86866f0e29fa29ce026fe
5+
image: kindest/node:v1.20.15@sha256:a32bf55309294120616886b5338f95dd98a2f7231519c7dedcec32ba29699394

kind-1.21.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ kind: Cluster
22
apiVersion: kind.x-k8s.io/v1alpha4
33
nodes:
44
- role: control-plane
5-
image: kindest/node:v1.21.14@sha256:f9b4d3d1112f24a7254d2ee296f177f628f9b4c1b32f0006567af11b91c1f301
5+
image: kindest/node:v1.21.14@sha256:8a4e9bb3f415d2bb81629ce33ef9c76ba514c14d707f9797a01e3216376ba093

kind-1.22.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ kind: Cluster
22
apiVersion: kind.x-k8s.io/v1alpha4
33
nodes:
44
- role: control-plane
5-
image: kindest/node:v1.22.13@sha256:4904eda4d6e64b402169797805b8ec01f50133960ad6c19af45173a27eadf959
5+
image: kindest/node:v1.22.17@sha256:f5b2e5698c6c9d6d0adc419c0deae21a425c07d81bbf3b6a6834042f25d4fba2

kind-1.23.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ kind: Cluster
22
apiVersion: kind.x-k8s.io/v1alpha4
33
nodes:
44
- role: control-plane
5-
image: kindest/node:v1.23.10@sha256:f047448af6a656fae7bc909e2fab360c18c487ef3edc93f06d78cdfd864b2d12
5+
image: kindest/node:v1.23.17@sha256:59c989ff8a517a93127d4a536e7014d28e235fb3529d9fba91b3951d461edfdb

kind-1.24.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ kind: Cluster
22
apiVersion: kind.x-k8s.io/v1alpha4
33
nodes:
44
- role: control-plane
5-
image: kindest/node:v1.24.4@sha256:adfaebada924a26c2c9308edd53c6e33b3d4e453782c0063dc0028bdebaddf98
5+
image: kindest/node:v1.24.15@sha256:7db4f8bea3e14b82d12e044e25e34bd53754b7f2b0e9d56df21774e6f66a70ab

kind-1.25.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ kind: Cluster
22
apiVersion: kind.x-k8s.io/v1alpha4
33
nodes:
44
- role: control-plane
5-
image: kindest/node:v1.25.3@sha256:f1de3b0670462f43280114eccceab8bf1b9576d2afe0582f8f74529da6fd0365
5+
image: kindest/node:v1.25.11@sha256:227fa11ce74ea76a0474eeefb84cb75d8dad1b08638371ecf0e86259b35be0c8

kind-1.26.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ kind: Cluster
22
apiVersion: kind.x-k8s.io/v1alpha4
33
nodes:
44
- role: control-plane
5-
image: kindest/node:v1.26.0@sha256:691e24bd2417609db7e589e1a479b902d2e209892a10ce375fab60a8407c7352
5+
image: kindest/node:v1.26.6@sha256:6e2d8b28a5b601defe327b98bd1c2d1930b49e5d8c512e1895099e4504007adb

kind-1.27.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ kind: Cluster
22
apiVersion: kind.x-k8s.io/v1alpha4
33
nodes:
44
- role: control-plane
5-
image: kindest/node:v1.27.0@sha256:c6b22e613523b1af67d4bc8a0c38a4c3ea3a2b8fbc5b367ae36345c9cb844518
5+
image: kindest/node:v1.27.3@sha256:3966ac761ae0136263ffdb6cfd4db23ef8a83cba8a463690e98317add2c9ba72

0 commit comments

Comments
 (0)