🌱 bump kind version to v0.22.0 #10094

cahillsf · 2024-02-04T14:58:29Z

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

k8s-ci-robot · 2024-02-04T14:58:32Z

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

cahillsf · 2024-02-04T16:58:24Z

test/infrastructure/kind/mapper_test.go

@@ -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,


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?

cahillsf · 2024-02-04T18:34:36Z

/test pull-cluster-api-e2e-full-main

k8s-ci-robot · 2024-02-04T18:34:38Z

@cahillsf: The specified target(s) for /test were not found.
The following commands are available to trigger required jobs:

/test pull-cluster-api-build-main
/test pull-cluster-api-e2e-blocking-main
/test pull-cluster-api-e2e-conformance-ci-latest-main
/test pull-cluster-api-e2e-conformance-main
/test pull-cluster-api-e2e-dualstack-and-ipv6-main
/test pull-cluster-api-e2e-main
/test pull-cluster-api-e2e-mink8s-main
/test pull-cluster-api-e2e-upgrade-1-29-1-30-main
/test pull-cluster-api-test-main
/test pull-cluster-api-test-mink8s-main
/test pull-cluster-api-verify-main

The following commands are available to trigger optional jobs:

/test pull-cluster-api-apidiff-main

Use /test all to run the following jobs that were automatically triggered:

pull-cluster-api-apidiff-main
pull-cluster-api-build-main
pull-cluster-api-e2e-blocking-main
pull-cluster-api-test-main
pull-cluster-api-verify-main

In response to this:

/test pull-cluster-api-e2e-full-main

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.

cahillsf · 2024-02-04T20:57:30Z

/test pull-cluster-api-e2e-main

test/infrastructure/kind/mapper.go

test/infrastructure/kind/mapper_test.go

cahillsf · 2024-02-06T23:12:30Z

@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

    
           If and when necessary: 
        
           * [ ] [Release Lead] [Track] [Bump the Cluster API apiVersion](https://github.com/kubernetes-sigs/cluster-api/blob/main/docs/release/release-tasks.md#optional-track-bump-the-cluster-api-apiversion) 
        
           * [ ] [Release Lead] [Track] [Bump the Kubernetes version](https://github.com/kubernetes-sigs/cluster-api/blob/main/docs/release/release-tasks.md#optional-track-bump-the-kubernetes-version) 
        
           * [ ] [Release Lead] [Track Release and Improvement tasks](https://github.com/kubernetes-sigs/cluster-api/blob/main/docs/release/release-tasks.md#optional-track-release-and-improvement-tasks)

chrischdi · 2024-02-07T07:24:24Z

test/infrastructure/kind/mapper_test.go

@@ -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"),


Suggested change

k8sVersion: semver.MustParse("1.29.99"),

k8sVersion: semver.MustParse("1.27.99"),

Could we also keep this the old value to not always bump?

sure thing, just pushed up the change

chrischdi

last nit

chrischdi · 2024-02-07T07:26:56Z

@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

If and when necessary:

* [ ] [Release Lead] [Track] [Bump the Cluster API apiVersion](https://github.com/kubernetes-sigs/cluster-api/blob/main/docs/release/release-tasks.md#optional-track-bump-the-cluster-api-apiversion)

* [ ] [Release Lead] [Track] [Bump the Kubernetes version](https://github.com/kubernetes-sigs/cluster-api/blob/main/docs/release/release-tasks.md#optional-track-bump-the-kubernetes-version)

* [ ] [Release Lead] [Track Release and Improvement tasks](https://github.com/kubernetes-sigs/cluster-api/blob/main/docs/release/release-tasks.md#optional-track-release-and-improvement-tasks)

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

sbueringer · 2024-02-15T05:36:00Z

Just saw there is a new kind 0.22 release with bugfixes (https://github.com/kubernetes-sigs/kind/releases/tag/v0.22.0)

This release is a quick follow-up to v0.21.0 with bug fixes including not overriding the host's binfmt_misc (a regression in v0.20.0, see: kubernetes-sigs/kind#3510).

cahillsf · 2024-02-15T22:55:56Z

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 v0.21.0 images too ?

chrischdi · 2024-02-16T07:32:54Z

Just saw there is a new kind 0.22 release with bugfixes (kubernetes-sigs/kind@v0.22.0 (release))

Oh cool, I’ll update this PR to just bump to that one then? Or would you prefer to include the v0.21.0 images too ?

Let's only include 0.21.0 images if they have a k8s patch version we would not have otherwise :-)

fabriziopandini · 2024-02-19T12:58:47Z

/test pull-cluster-api-e2e-conformance-ci-latest-main

test/infrastructure/kind/mapper.go

chrischdi

One change but then I think we are good to go :-)

chrischdi · 2024-02-21T14:44:26Z

Wow interesting error on the prowjobs:

Pod can not be created: create pod test-pod ... n API group "" in the namespace "test-pods" BaseSHA:0045baf02ce542fad0f96e42ab2decc41822256e

chrischdi · 2024-02-21T14:44:28Z

/retest

cahillsf · 2024-02-21T14:45:13Z

/retest

chrischdi · 2024-02-21T14:46:43Z

/retest

chrischdi

/approve

/assign @fabriziopandini

chrischdi · 2024-02-21T15:11:02Z

/retest

chrischdi · 2024-02-21T15:28:06Z

/retest

cahillsf · 2024-02-21T15:28:20Z

/retest

chrischdi · 2024-02-21T15:28:39Z

@cahillsf : maybe requires a force push to retrigger the tests. Don't know if they already fixed the issue.

cahillsf · 2024-02-21T15:35:20Z

@cahillsf : maybe requires a force push to retrigger the tests. Don't know if they already fixed the issue.

hmm seems like the issue is still there. seems like the retest commands are maybe not triggering a retest either?

chrischdi · 2024-02-21T17:07:49Z

/retest

chrischdi · 2024-02-21T17:08:04Z

Seems to be back working 👍

chrischdi · 2024-02-21T17:22:10Z

/assign @fabriziopandini

fabriziopandini · 2024-02-21T17:41:16Z

test/infrastructure/kind/mapper.go

@@ -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.


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",

},

@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.

I prefer to keep the bump mechanical (we should not check sha manually, just add them in order)

Talked to fabrizio: let's re-add the images (sorry for aksing you to remove it earlier) :-)

np! just added them back in when you have a chance to review

chrischdi

/lgtm
/approve

Let's get ci back to green

k8s-ci-robot · 2024-02-22T22:06:21Z

LGTM label has been added.

Git tree hash: efc0f57d99b0f585968d9e4a468dfe5bd08c4d57

k8s-ci-robot · 2024-02-22T22:07:13Z

[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:

~~OWNERS~~ [chrischdi]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

k8s-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. area/dependency Issues or PRs related to dependency changes cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Feb 4, 2024

k8s-ci-robot requested review from elmiko and jackfrancis February 4, 2024 14:58

k8s-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Feb 4, 2024

cahillsf force-pushed the upgrade-kind-version branch from 37d81ad to 3451e39 Compare February 4, 2024 15:00

cahillsf changed the title ~~bump kind version to v0.21.0~~ 🌱 bump kind version to v0.21.0 Feb 4, 2024

cahillsf commented Feb 4, 2024

View reviewed changes

cahillsf marked this pull request as ready for review February 4, 2024 17:00

k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Feb 4, 2024

k8s-ci-robot requested a review from JoelSpeed February 4, 2024 17:00

chrischdi reviewed Feb 5, 2024

View reviewed changes

test/infrastructure/kind/mapper.go Outdated Show resolved Hide resolved

test/infrastructure/kind/mapper_test.go Outdated Show resolved Hide resolved

cahillsf force-pushed the upgrade-kind-version branch 3 times, most recently from fd7c8de to 97d1df4 Compare February 6, 2024 23:09

chrischdi reviewed Feb 7, 2024

View reviewed changes

cahillsf force-pushed the upgrade-kind-version branch from 97d1df4 to d38f3ed Compare February 8, 2024 13:45

k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Feb 10, 2024

chrischdi reviewed Feb 21, 2024

View reviewed changes

test/infrastructure/kind/mapper.go Show resolved Hide resolved

chrischdi reviewed Feb 21, 2024

View reviewed changes

cahillsf force-pushed the upgrade-kind-version branch from b3f71d7 to 0b7939e Compare February 21, 2024 14:40

chrischdi reviewed Feb 21, 2024

View reviewed changes

k8s-ci-robot assigned fabriziopandini Feb 21, 2024

k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 21, 2024

cahillsf force-pushed the upgrade-kind-version branch from 0b7939e to 99521fc Compare February 21, 2024 15:32

fabriziopandini reviewed Feb 22, 2024

View reviewed changes

Bump kind to v0.22.0

5fcd246

cahillsf force-pushed the upgrade-kind-version branch from 99521fc to 5fcd246 Compare February 22, 2024 18:07

chrischdi reviewed Feb 22, 2024

View reviewed changes

k8s-ci-robot assigned chrischdi Feb 22, 2024

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Feb 22, 2024

k8s-ci-robot merged commit 5935e7c into kubernetes-sigs:main Feb 22, 2024
20 checks passed

k8s-ci-robot added this to the v1.7 milestone Feb 22, 2024

chrischdi mentioned this pull request Apr 12, 2024

Tasks to bump to Kubernetes v1.30 #10026

Closed

13 tasks

	k8sVersion: semver.MustParse("1.29.99"),
	k8sVersion: semver.MustParse("1.27.99"),

	// 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",
	},

🌱 bump kind version to v0.22.0 #10094

🌱 bump kind version to v0.22.0 #10094

Conversation

cahillsf commented Feb 4, 2024

k8s-ci-robot commented Feb 4, 2024

cahillsf Feb 4, 2024 • edited Loading

Choose a reason for hiding this comment

cahillsf commented Feb 4, 2024

k8s-ci-robot commented Feb 4, 2024

cahillsf commented Feb 4, 2024

cahillsf commented Feb 6, 2024

chrischdi Feb 7, 2024

Choose a reason for hiding this comment

cahillsf Feb 8, 2024

Choose a reason for hiding this comment

chrischdi left a comment

Choose a reason for hiding this comment

chrischdi commented Feb 7, 2024

sbueringer commented Feb 15, 2024

cahillsf commented Feb 15, 2024

chrischdi commented Feb 16, 2024

fabriziopandini commented Feb 19, 2024

chrischdi left a comment

Choose a reason for hiding this comment

chrischdi commented Feb 21, 2024

chrischdi commented Feb 21, 2024

cahillsf commented Feb 21, 2024

chrischdi commented Feb 21, 2024

chrischdi left a comment

Choose a reason for hiding this comment

chrischdi commented Feb 21, 2024

chrischdi commented Feb 21, 2024

cahillsf commented Feb 21, 2024

chrischdi commented Feb 21, 2024

cahillsf commented Feb 21, 2024 • edited Loading

chrischdi commented Feb 21, 2024

chrischdi commented Feb 21, 2024

chrischdi commented Feb 21, 2024

fabriziopandini Feb 21, 2024

Choose a reason for hiding this comment

chrischdi Feb 22, 2024

Choose a reason for hiding this comment

fabriziopandini Feb 22, 2024

Choose a reason for hiding this comment

chrischdi Feb 22, 2024

Choose a reason for hiding this comment

cahillsf Feb 22, 2024

Choose a reason for hiding this comment

chrischdi left a comment

Choose a reason for hiding this comment

k8s-ci-robot commented Feb 22, 2024

k8s-ci-robot commented Feb 22, 2024

cahillsf Feb 4, 2024 •

edited

Loading

cahillsf commented Feb 21, 2024 •

edited

Loading