-
Notifications
You must be signed in to change notification settings - Fork 1.3k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
🌱 bump kind version to v0.22.0 #10094
🌱 bump kind version to v0.22.0 #10094
Conversation
Skipping CI for Draft Pull Request. |
37d81ad
to
3451e39
Compare
@@ -44,10 +44,18 @@ func TestGetMapping(t *testing.T) { | |||
k8sVersion: semver.MustParse("1.23.17"), | |||
customImage: "foo", | |||
expectedMapping: Mapping{ | |||
Mode: Mode0_20, | |||
Mode: Mode0_21, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this change I am not entirely confident in based on the test name No match for custom image fallback on K8s version match
, what determines the kind mode based on the k8s version passed?
/test pull-cluster-api-e2e-full-main |
@cahillsf: The specified target(s) for
The following commands are available to trigger optional jobs:
Use
In response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. |
/test pull-cluster-api-e2e-main |
fd7c8de
to
97d1df4
Compare
@killianmuldoon should this fall under release team tasks going forward? if so i was thinking we should add to the tasks template: cluster-api/.github/ISSUE_TEMPLATE/release_tracking.md Lines 81 to 84 in 97782fe
|
@@ -90,7 +98,7 @@ func TestGetMapping(t *testing.T) { | |||
}, | |||
{ | |||
name: "No Match custom image, No match Future version gets latest kind mode", | |||
k8sVersion: semver.MustParse("1.27.99"), | |||
k8sVersion: semver.MustParse("1.29.99"), |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
k8sVersion: semver.MustParse("1.29.99"), | |
k8sVersion: semver.MustParse("1.27.99"), |
Could we also keep this the old value to not always bump?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
sure thing, just pushed up the change
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
last nit
Its already part of the k8s bump tracking issue: https://github.com/kubernetes-sigs/cluster-api/blob/da0ff648111aac465dda7f30a97ff482b6f6e8e9/.github/ISSUE_TEMPLATE/kubernetes_bump.md?plain=1 |
97d1df4
to
d38f3ed
Compare
Just saw there is a new kind 0.22 release with bugfixes (https://github.com/kubernetes-sigs/kind/releases/tag/v0.22.0)
|
Oh cool, I’ll update this PR to just bump to that one then? Or would you prefer to include the |
Let's only include 0.21.0 images if they have a k8s patch version we would not have otherwise :-) |
/test pull-cluster-api-e2e-conformance-ci-latest-main |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
One change but then I think we are good to go :-)
b3f71d7
to
0b7939e
Compare
Wow interesting error on the prowjobs:
|
/retest |
2 similar comments
/retest |
/retest |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
/approve
/assign @fabriziopandini
/retest |
2 similar comments
/retest |
/retest |
@cahillsf : maybe requires a force push to retrigger the tests. Don't know if they already fixed the issue. |
0b7939e
to
99521fc
Compare
hmm seems like the issue is still there. seems like the retest commands are maybe not triggering a retest either? |
/retest |
Seems to be back working 👍 |
/assign @fabriziopandini |
@@ -79,6 +79,62 @@ type Mapping struct { | |||
var preBuiltMappings = []Mapping{ | |||
|
|||
// TODO: Add pre-built images for newer Kind versions on top | |||
// Pre-built images for Kind v1.22. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Even if not strictly necessary, I think we should add also v1.21 images (this is the same approach we used since the beginning: mechanically copy images in, let the logic to pick the right one)
you can quickly copy them from
cluster-api/test/infrastructure/kind/mapper.go
Lines 139 to 174 in dbdc74f
// Pre-built images for Kind v1.21. | |
{ | |
KubernetesVersion: semver.MustParse("1.29.1"), | |
Mode: Mode0_20, | |
Image: "kindest/node:v1.29.1@sha256:a0cc28af37cf39b019e2b448c54d1a3f789de32536cb5a5db61a49623e527144", | |
}, | |
{ | |
KubernetesVersion: semver.MustParse("1.28.6"), | |
Mode: Mode0_20, | |
Image: "kindest/node:v1.28.6@sha256:b7e1cf6b2b729f604133c667a6be8aab6f4dde5bb042c1891ae248d9154f665b", | |
}, | |
{ | |
KubernetesVersion: semver.MustParse("1.27.10"), | |
Mode: Mode0_20, | |
Image: "kindest/node:v1.27.10@sha256:3700c811144e24a6c6181065265f69b9bf0b437c45741017182d7c82b908918f", | |
}, | |
{ | |
KubernetesVersion: semver.MustParse("1.26.13"), | |
Mode: Mode0_20, | |
Image: "kindest/node:v1.26.13@sha256:15ae92d507b7d4aec6e8920d358fc63d3b980493db191d7327541fbaaed1f789", | |
}, | |
{ | |
KubernetesVersion: semver.MustParse("1.25.16"), | |
Mode: Mode0_20, | |
Image: "kindest/node:v1.25.16@sha256:9d0a62b55d4fe1e262953be8d406689b947668626a357b5f9d0cfbddbebbc727", | |
}, | |
{ | |
KubernetesVersion: semver.MustParse("1.24.17"), | |
Mode: Mode0_20, | |
Image: "kindest/node:v1.24.17@sha256:ea292d57ec5dd0e2f3f5a2d77efa246ac883c051ff80e887109fabefbd3125c7", | |
}, | |
{ | |
KubernetesVersion: semver.MustParse("1.23.17"), | |
Mode: Mode0_20, | |
Image: "kindest/node:v1.23.17@sha256:fbb92ac580fce498473762419df27fa8664dbaa1c5a361b5957e123b4035bdcf", | |
}, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@fabriziopandini I did comment to remove them because they did contain the same kubernetes versions as for kind v0.22 and would never get used because of the kind v0.22 images would match first.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I prefer to keep the bump mechanical (we should not check sha manually, just add them in order)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Talked to fabrizio: let's re-add the images (sorry for aksing you to remove it earlier) :-)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
np! just added them back in when you have a chance to review
99521fc
to
5fcd246
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
/lgtm
/approve
Let's get ci back to green
LGTM label has been added. Git tree hash: efc0f57d99b0f585968d9e4a468dfe5bd08c4d57
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: chrischdi The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
What this PR does / why we need it:
Which issue(s) this PR fixes (optional, in
fixes #<issue number>(, fixes #<issue_number>, ...)
format, will close the issue(s) when PR gets merged):Fixes #8977
/area dependency