From 1b1738cee0aeaaea444001c2b5fb40c3a641cbc2 Mon Sep 17 00:00:00 2001
From: Christian Schlotter <christian.schlotter@broadcom.com>
Date: Tue, 17 Dec 2024 14:08:14 +0100
Subject: [PATCH] Bump sigs.k8s.io/kind to v0.26.0

---
 hack/ensure-kind.sh                       |  3 +--
 test/framework/bootstrap/kind_provider.go |  2 +-
 test/go.mod                               |  2 +-
 test/go.sum                               |  4 ++--
 test/infrastructure/kind/mapper.go        | 22 ++++++++++++++++++++++
 5 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/hack/ensure-kind.sh b/hack/ensure-kind.sh
index 90ae0788fa7e..51629e8f2c5b 100755
--- a/hack/ensure-kind.sh
+++ b/hack/ensure-kind.sh
@@ -30,8 +30,7 @@ goarch="$(go env GOARCH)"
 goos="$(go env GOOS)"
 
 # Note: When updating the MINIMUM_KIND_VERSION new shas MUST be added in `preBuiltMappings` at `test/infrastructure/kind/mapper.go`
-# Note: The kind version here is out of sync with our go dependency which is 0.25.0 due to issues building images <= kubernetes v1.30.
-MINIMUM_KIND_VERSION=v0.24.0
+MINIMUM_KIND_VERSION=v0.26.0
 
 
 # Ensure the kind tool exists and is a viable version, or installs it
diff --git a/test/framework/bootstrap/kind_provider.go b/test/framework/bootstrap/kind_provider.go
index 4d1528f183fc..9d32753f1837 100644
--- a/test/framework/bootstrap/kind_provider.go
+++ b/test/framework/bootstrap/kind_provider.go
@@ -37,7 +37,7 @@ const (
 	DefaultNodeImageRepository = "kindest/node"
 
 	// DefaultNodeImageVersion is the default Kubernetes version to be used for creating a kind cluster.
-	DefaultNodeImageVersion = "v1.32.0@sha256:2458b423d635d7b01637cac2d6de7e1c1dca1148a2ba2e90975e214ca849e7cb"
+	DefaultNodeImageVersion = "v1.32.0@sha256:c48c62eac5da28cdadcf560d1d8616cfa6783b58f0d94cf63ad1bf49600cb027"
 )
 
 // KindClusterOption is a NewKindClusterProvider option.
diff --git a/test/go.mod b/test/go.mod
index 4e7b1ddb6c33..f35d61e0d812 100644
--- a/test/go.mod
+++ b/test/go.mod
@@ -34,7 +34,7 @@ require (
 	k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
 	sigs.k8s.io/cluster-api v0.0.0-00010101000000-000000000000
 	sigs.k8s.io/controller-runtime v0.19.4
-	sigs.k8s.io/kind v0.25.0
+	sigs.k8s.io/kind v0.26.0
 	sigs.k8s.io/yaml v1.4.0
 )
 
diff --git a/test/go.sum b/test/go.sum
index 4b6a02bb3c0b..25b21dca6490 100644
--- a/test/go.sum
+++ b/test/go.sum
@@ -460,8 +460,8 @@ sigs.k8s.io/controller-runtime v0.19.4 h1:SUmheabttt0nx8uJtoII4oIP27BVVvAKFvdvGF
 sigs.k8s.io/controller-runtime v0.19.4/go.mod h1:iRmWllt8IlaLjvTTDLhRBXIEtkCK6hwVBJJsYS9Ajf4=
 sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
 sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
-sigs.k8s.io/kind v0.25.0 h1:ugUvgesHKKA0yKmD6QtYTiEev+kPUpGxdTPbMGf8VTU=
-sigs.k8s.io/kind v0.25.0/go.mod h1:t7ueEpzPYJvHA8aeLtI52rtFftNgUYUaCwvxjk7phfw=
+sigs.k8s.io/kind v0.26.0 h1:8fS6I0Q5WGlmLprSpH0DarlOSdcsv0txnwc93J2BP7M=
+sigs.k8s.io/kind v0.26.0/go.mod h1:t7ueEpzPYJvHA8aeLtI52rtFftNgUYUaCwvxjk7phfw=
 sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4=
 sigs.k8s.io/structured-merge-diff/v4 v4.4.1/go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08=
 sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=
diff --git a/test/infrastructure/kind/mapper.go b/test/infrastructure/kind/mapper.go
index a3903a72993c..353ae2a9afaf 100644
--- a/test/infrastructure/kind/mapper.go
+++ b/test/infrastructure/kind/mapper.go
@@ -79,6 +79,28 @@ type Mapping struct {
 var preBuiltMappings = []Mapping{
 
 	// TODO: Add pre-built images for newer Kind versions on top
+	// Pre-built images for Kind v1.26.
+	{
+		KubernetesVersion: semver.MustParse("1.32.0"),
+		Mode:              Mode0_20,
+		Image:             "kindest/node:v1.32.0@sha256:c48c62eac5da28cdadcf560d1d8616cfa6783b58f0d94cf63ad1bf49600cb027",
+	},
+	{
+		KubernetesVersion: semver.MustParse("1.31.4"),
+		Mode:              Mode0_20,
+		Image:             "kindest/node:v1.31.4@sha256:2cb39f7295fe7eafee0842b1052a599a4fb0f8bcf3f83d96c7f4864c357c6c30",
+	},
+	{
+		KubernetesVersion: semver.MustParse("1.30.8"),
+		Mode:              Mode0_20,
+		Image:             "kindest/node:v1.30.8@sha256:17cd608b3971338d9180b00776cb766c50d0a0b6b904ab4ff52fd3fc5c6369bf",
+	},
+	{
+		KubernetesVersion: semver.MustParse("1.29.12"),
+		Mode:              Mode0_20,
+		Image:             "kindest/node:v1.29.12@sha256:62c0672ba99a4afd7396512848d6fc382906b8f33349ae68fb1dbfe549f70dec",
+	},
+
 	// Pre-built images for Kind v1.25.
 	{
 		KubernetesVersion: semver.MustParse("1.32.0"),