Skip to content

Commit 8300fa2

Browse files
authored
Merge branch 'master' into fix-resource-path-lookup
2 parents 652b60b + 26a569f commit 8300fa2

File tree

2 files changed

+26
-26
lines changed

2 files changed

+26
-26
lines changed

.github/workflows/kind_e2e.yaml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -58,25 +58,25 @@ jobs:
5858
fail-fast: false # Keep running if one leg fails.
5959
matrix:
6060
k8s-version:
61-
- v1.23.12
62-
- v1.24.6
63-
- v1.25.2
61+
- v1.32.9
62+
- v1.33.5
63+
- v1.34.1
6464
mode:
6565
- ha
6666
- non-ha
6767
# Map between K8s and KinD versions.
6868
# This is attempting to make it a bit clearer what's being tested.
69-
# See: https://github.com/kubernetes-sigs/kind/releases/tag/v0.16.0
69+
# See: https://github.com/kubernetes-sigs/kind/releases/tag/v0.30.0
7070
include:
71-
- k8s-version: v1.23.12
72-
kind-version: v0.16.0
73-
kind-image-sha: sha256:9402cf1330bbd3a0d097d2033fa489b2abe40d479cc5ef47d0b6a6960613148a
74-
- k8s-version: v1.24.6
75-
kind-version: v0.16.0
76-
kind-image-sha: sha256:97e8d00bc37a7598a0b32d1fabd155a96355c49fa0d4d4790aab0f161bf31be1
77-
- k8s-version: v1.25.2
78-
kind-version: v0.16.0
79-
kind-image-sha: sha256:9be91e9e9cdf116809841fc77ebdb8845443c4c72fe5218f3ae9eb57fdb4bace
71+
- k8s-version: v1.32.9
72+
kind-version: v0.24.0
73+
kind-image-sha: sha256:53df588e04085fd41ae12de0c3fe4c72f7013bba32a20e7325357a1ac94ba865
74+
- k8s-version: v1.33.5
75+
kind-version: v0.24.0
76+
kind-image-sha: sha256:53df588e04085fd41ae12de0c3fe4c72f7013bba32a20e7325357a1ac94ba865
77+
- k8s-version: v1.34.1
78+
kind-version: v0.24.0
79+
kind-image-sha: sha256:53df588e04085fd41ae12de0c3fe4c72f7013bba32a20e7325357a1ac94ba865
8080
steps:
8181
- name: Check out code onto GOPATH
8282
uses: actions/checkout@v4

.github/workflows/upgrade_e2e.yaml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -53,25 +53,25 @@ jobs:
5353
fail-fast: false # Keep running if one leg fails.
5454
matrix:
5555
k8s-version:
56-
- v1.23.12
57-
- v1.24.6
58-
- v1.25.2
56+
- v1.32.9
57+
- v1.33.5
58+
- v1.34.1
5959
mode:
6060
- ha
6161
- non-ha
6262
# Map between K8s and KinD versions.
6363
# This is attempting to make it a bit clearer what's being tested.
64-
# See: https://github.com/kubernetes-sigs/kind/releases/tag/v0.16.0
64+
# See: https://github.com/kubernetes-sigs/kind/releases/tag/v0.30.0
6565
include:
66-
- k8s-version: v1.23.12
67-
kind-version: v0.16.0
68-
kind-image-sha: sha256:9402cf1330bbd3a0d097d2033fa489b2abe40d479cc5ef47d0b6a6960613148a
69-
- k8s-version: v1.24.6
70-
kind-version: v0.16.0
71-
kind-image-sha: sha256:97e8d00bc37a7598a0b32d1fabd155a96355c49fa0d4d4790aab0f161bf31be1
72-
- k8s-version: v1.25.2
73-
kind-version: v0.16.0
74-
kind-image-sha: sha256:9be91e9e9cdf116809841fc77ebdb8845443c4c72fe5218f3ae9eb57fdb4bace
66+
- k8s-version: v1.32.9
67+
kind-version: v0.24.0
68+
kind-image-sha: sha256:53df588e04085fd41ae12de0c3fe4c72f7013bba32a20e7325357a1ac94ba865
69+
- k8s-version: v1.33.5
70+
kind-version: v0.24.0
71+
kind-image-sha: sha256:53df588e04085fd41ae12de0c3fe4c72f7013bba32a20e7325357a1ac94ba865
72+
- k8s-version: v1.34.1
73+
kind-version: v0.24.0
74+
kind-image-sha: sha256:53df588e04085fd41ae12de0c3fe4c72f7013bba32a20e7325357a1ac94ba865
7575
steps:
7676
- name: Check out code onto GOPATH
7777
uses: actions/checkout@v4

0 commit comments

Comments
 (0)