From a39dddcabc3c15a87ab0fce5fa5449f5393cb40d Mon Sep 17 00:00:00 2001
From: Nick Santos <nick.santos@docker.com>
Date: Tue, 17 Dec 2024 11:26:15 -0500
Subject: [PATCH] cluster: update to kind 1.26 (#371)

Signed-off-by: Nick Santos <nick.santos@docker.com>
---
 .circleci/Dockerfile      | 2 +-
 .circleci/config.yml      | 4 ++--
 hack/Dockerfile           | 2 +-
 pkg/cluster/admin_kind.go | 6 ++++++
 test/kind/e2e.sh          | 4 ++--
 5 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/.circleci/Dockerfile b/.circleci/Dockerfile
index 4df2438..2f33129 100644
--- a/.circleci/Dockerfile
+++ b/.circleci/Dockerfile
@@ -35,7 +35,7 @@ RUN curl -LO "https://dl.k8s.io/release/${KUBECTL_VERSION}/bin/linux/amd64/kubec
     && install -o root -g root -m 0755 kubectl /usr/local/bin/kubectl
 
 # install Kind
-ENV KIND_VERSION=v0.25.0
+ENV KIND_VERSION=v0.26.0
 RUN set -exu \
   && curl -fLo ./kind-linux-amd64 "https://github.com/kubernetes-sigs/kind/releases/download/${KIND_VERSION}/kind-linux-amd64" \
   && chmod +x ./kind-linux-amd64 \
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5671a15..8506896 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -17,7 +17,7 @@ jobs:
 
   e2e-remote-docker:
     docker:
-      - image: docker/tilt-ctlptl-ci@sha256:075ad7149112ef9189022a575dac39dcb8de7e1cc8b548b0e9023fb6f1c0939e
+      - image: docker/tilt-ctlptl-ci@sha256:74aa83c8c415c0a1c3a35c6a6debf10f463bd1794ed263f8acda8b375dd262db
     steps:
       - checkout
       - setup_remote_docker
@@ -43,7 +43,7 @@ jobs:
           sudo mv ./minikube-linux-amd64 /usr/local/bin/minikube
       - run: |
           set -ex
-          export KIND_VERSION=v0.25.0
+          export KIND_VERSION=v0.26.0
           curl -fLo ./kind-linux-amd64 "https://github.com/kubernetes-sigs/kind/releases/download/${KIND_VERSION}/kind-linux-amd64"
           chmod +x ./kind-linux-amd64
           sudo mv ./kind-linux-amd64 /usr/local/bin/kind
diff --git a/hack/Dockerfile b/hack/Dockerfile
index 4356b98..a1d3932 100644
--- a/hack/Dockerfile
+++ b/hack/Dockerfile
@@ -37,7 +37,7 @@ RUN curl -LO "https://dl.k8s.io/release/${KUBECTL_VERSION}/bin/linux/${TARGETARC
     && install -o root -g root -m 0755 kubectl /usr/local/bin/kubectl
 
 # Install Kind
-ENV KIND_VERSION=v0.25.0
+ENV KIND_VERSION=v0.26.0
 RUN set -exu \
   && KIND_URL="https://github.com/kubernetes-sigs/kind/releases/download/${KIND_VERSION}/kind-linux-$TARGETARCH" \
   && curl --silent --show-error --location --fail --retry 3 --output ./kind-linux-$TARGETARCH "$KIND_URL" \
diff --git a/pkg/cluster/admin_kind.go b/pkg/cluster/admin_kind.go
index 264fa43..a70c375 100644
--- a/pkg/cluster/admin_kind.go
+++ b/pkg/cluster/admin_kind.go
@@ -334,6 +334,12 @@ func (a *kindAdmin) getKindVersion(ctx context.Context) (string, error) {
 // This table must be built up manually from the Kind release notes each
 // time a new Kind version is released :\
 var kindK8sNodeTable = map[string]map[string]string{
+	"v0.26.0": {
+		"1.32": "kindest/node:v1.32.0@sha256:c48c62eac5da28cdadcf560d1d8616cfa6783b58f0d94cf63ad1bf49600cb027",
+		"1.31": "kindest/node:v1.31.4@sha256:2cb39f7295fe7eafee0842b1052a599a4fb0f8bcf3f83d96c7f4864c357c6c30",
+		"1.30": "kindest/node:v1.30.8@sha256:17cd608b3971338d9180b00776cb766c50d0a0b6b904ab4ff52fd3fc5c6369bf",
+		"1.29": "kindest/node:v1.29.12@sha256:62c0672ba99a4afd7396512848d6fc382906b8f33349ae68fb1dbfe549f70dec",
+	},
 	"v0.25.0": {
 		"1.31": "kindest/node:v1.31.2@sha256:18fbefc20a7113353c7b75b5c869d7145a6abd6269154825872dc59c1329912e",
 		"1.30": "kindest/node:v1.30.6@sha256:b6d08db72079ba5ae1f4a88a09025c0a904af3b52387643c285442afb05ab994",
diff --git a/test/kind/e2e.sh b/test/kind/e2e.sh
index 42036f6..fdcab06 100755
--- a/test/kind/e2e.sh
+++ b/test/kind/e2e.sh
@@ -53,8 +53,8 @@ k8sVersion=$(ctlptl get cluster "$CLUSTER_NAME" -o go-template --template='{{.st
 
 ctlptl delete -f cluster.yaml
 
-if [[ "$k8sVersion" != "v1.31.2" ]]; then
-    echo "Expected kubernetes version v1.31.2 but got $k8sVersion"
+if [[ "$k8sVersion" != "v1.31.4" ]]; then
+    echo "Expected kubernetes version v1.31.4 but got $k8sVersion"
     exit 1
 fi