Bump to kind 0.21 and default to k8s 1.29

Images are provided down to 1.23 for kind 0.21; older hashes are preserved but without any guarantee. Signed-off-by: Stephen Kitt <[email protected]>
submariner-io · Feb 6, 2024 · 8f26152 · 8f26152
1 parent b617dfc
commit 8f26152
Show file tree

Hide file tree

Showing 6 changed files with 81 additions and 13 deletions.
diff --git a/.github/workflows/consuming.yml b/.github/workflows/consuming.yml
@@ -21,7 +21,7 @@ jobs:
         project: ['admiral', 'lighthouse', 'subctl', 'submariner', 'submariner-operator']
         cabledriver: ['libreswan']
         # Run most tests against the latest K8s version
-        k8s_version: ['1.28']
+        k8s_version: ['1.29']
         include:
           # Test the same set of cable driver combinations as the consuming projects do in their CI
           - project: submariner

diff --git a/Makefile.clusters b/Makefile.clusters
@@ -10,7 +10,7 @@ TIMEOUT ?= 5m
 export PARALLEL SETTINGS TIMEOUT
 
 # Flags affecting `make clusters`
-K8S_VERSION ?= 1.28
+K8S_VERSION ?= 1.29
 METALLB_VERSION ?= 0.13.5
 OLM_VERSION ?= v0.18.3
 PROVIDER ?= kind

diff --git a/gh-actions/e2e/action.yaml b/gh-actions/e2e/action.yaml
@@ -9,7 +9,7 @@ inputs:
   k8s_version:
     description: 'Version of Kubernetes to use for clusters'
     required: false
-    default: '1.28'
+    default: '1.29'
   using:
     description: 'Various options to pass via using="..."'
     required: false

diff --git a/scripts/shared/lib/clusters_kind b/scripts/shared/lib/clusters_kind
@@ -12,12 +12,14 @@ kind_k8s_versions[1.20]=1.20.15@sha256:a32bf55309294120616886b5338f95dd98a2f7231
 # kind 0.20.0 hashes
 kind_k8s_versions[1.21]=1.21.14@sha256:8a4e9bb3f415d2bb81629ce33ef9c76ba514c14d707f9797a01e3216376ba093
 kind_k8s_versions[1.22]=1.22.17@sha256:f5b2e5698c6c9d6d0adc419c0deae21a425c07d81bbf3b6a6834042f25d4fba2
-kind_k8s_versions[1.23]=1.23.17@sha256:59c989ff8a517a93127d4a536e7014d28e235fb3529d9fba91b3951d461edfdb
-kind_k8s_versions[1.24]=1.24.15@sha256:7db4f8bea3e14b82d12e044e25e34bd53754b7f2b0e9d56df21774e6f66a70ab
-kind_k8s_versions[1.25]=1.25.11@sha256:227fa11ce74ea76a0474eeefb84cb75d8dad1b08638371ecf0e86259b35be0c8
-kind_k8s_versions[1.26]=1.26.6@sha256:6e2d8b28a5b601defe327b98bd1c2d1930b49e5d8c512e1895099e4504007adb
-kind_k8s_versions[1.27]=1.27.3@sha256:3966ac761ae0136263ffdb6cfd4db23ef8a83cba8a463690e98317add2c9ba72
-kind_k8s_versions[1.28]=1.28.0@sha256:b7a4cad12c197af3ba43202d3efe03246b3f0793f162afb40a33c923952d5b31
+# kind 0.21.0 hashes
+kind_k8s_versions[1.23]=1.23.17@sha256:fbb92ac580fce498473762419df27fa8664dbaa1c5a361b5957e123b4035bdcf
+kind_k8s_versions[1.24]=1.24.17@sha256:ea292d57ec5dd0e2f3f5a2d77efa246ac883c051ff80e887109fabefbd3125c7
+kind_k8s_versions[1.25]=1.25.16@sha256:9d0a62b55d4fe1e262953be8d406689b947668626a357b5f9d0cfbddbebbc727
+kind_k8s_versions[1.26]=1.26.13@sha256:15ae92d507b7d4aec6e8920d358fc63d3b980493db191d7327541fbaaed1f789
+kind_k8s_versions[1.27]=1.27.10@sha256:3700c811144e24a6c6181065265f69b9bf0b437c45741017182d7c82b908918f
+kind_k8s_versions[1.28]=1.28.6@sha256:b7e1cf6b2b729f604133c667a6be8aab6f4dde5bb042c1891ae248d9154f665b
+kind_k8s_versions[1.29]=1.29.1@sha256:a0cc28af37cf39b019e2b448c54d1a3f789de32536cb5a5db61a49623e527144
 
 ### Functions ###
 

diff --git a/tools/go.mod b/tools/go.mod
@@ -1,14 +1,14 @@
 module github.com/submariner-io/shipyard/tools
 
-go 1.20
+go 1.21
 
 require (
 	github.com/docker/buildx v0.12.1
 	github.com/golangci/golangci-lint v1.55.2
 	github.com/mikefarah/yq/v4 v4.40.5
 	github.com/psampaz/go-mod-outdated v0.9.0
 	helm.sh/helm/v3 v3.14.0
-	sigs.k8s.io/kind v0.20.0
+	sigs.k8s.io/kind v0.21.0
 )
 
 require (