From 2d60485bbe1f20960e30b1231caa46a0117e75ed Mon Sep 17 00:00:00 2001
From: Nick Santos <nick@tilt.dev>
Date: Mon, 7 Mar 2022 12:58:59 -0500
Subject: [PATCH] cluster: bump kind version (#188)

---
 .circleci/Dockerfile             |  2 +-
 .circleci/config.yml             |  2 +-
 hack/Dockerfile                  |  2 +-
 pkg/cluster/admin_kind.go        | 12 ++++++++++++
 test/kind-cluster-network/e2e.sh |  4 ++--
 5 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/.circleci/Dockerfile b/.circleci/Dockerfile
index 65e1b51..a038758 100644
--- a/.circleci/Dockerfile
+++ b/.circleci/Dockerfile
@@ -36,7 +36,7 @@ RUN apt install -y apt-transport-https gnupg \
   && apt update && apt install -y kubectl
 
 # install Kind
-ENV KIND_VERSION=v0.11.1
+ENV KIND_VERSION=v0.12.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 f2c95e0..74250b1 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -57,7 +57,7 @@ jobs:
           sudo mv ./minikube-linux-amd64 /usr/local/bin/minikube
       - run: |
           set -ex
-          export KIND_VERSION=v0.11.1
+          export KIND_VERSION=v0.12.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 185ea08..a2e09c2 100644
--- a/hack/Dockerfile
+++ b/hack/Dockerfile
@@ -37,7 +37,7 @@ RUN apt install -y apt-transport-https gnupg \
   && apt update && apt install -y kubectl
 
 # install Kind
-ENV KIND_VERSION=v0.11.1
+ENV KIND_VERSION=v0.12.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/pkg/cluster/admin_kind.go b/pkg/cluster/admin_kind.go
index 452ada5..dec6571 100644
--- a/pkg/cluster/admin_kind.go
+++ b/pkg/cluster/admin_kind.go
@@ -197,6 +197,18 @@ 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.12.0": map[string]string{
+		"1.23": "kindest/node:v1.23.4@sha256:0e34f0d0fd448aa2f2819cfd74e99fe5793a6e4938b328f657c8e3f81ee0dfb9",
+		"1.22": "kindest/node:v1.22.7@sha256:1dfd72d193bf7da64765fd2f2898f78663b9ba366c2aa74be1fd7498a1873166",
+		"1.21": "kindest/node:v1.21.10@sha256:84709f09756ba4f863769bdcabe5edafc2ada72d3c8c44d6515fc581b66b029c",
+		"1.20": "kindest/node:v1.20.15@sha256:393bb9096c6c4d723bb17bceb0896407d7db581532d11ea2839c80b28e5d8deb",
+		"1.19": "kindest/node:v1.19.16@sha256:81f552397c1e6c1f293f967ecb1344d8857613fb978f963c30e907c32f598467",
+		"1.18": "kindest/node:v1.18.20@sha256:e3dca5e16116d11363e31639640042a9b1bd2c90f85717a7fc66be34089a8169",
+		"1.17": "kindest/node:v1.17.17@sha256:e477ee64df5731aa4ef4deabbafc34e8d9a686b49178f726563598344a3898d5",
+		"1.16": "kindest/node:v1.16.15@sha256:64bac16b83b6adfd04ea3fbcf6c9b5b893277120f2b2cbf9f5fa3e5d4c2260cc",
+		"1.15": "kindest/node:v1.15.12@sha256:9dfc13db6d3fd5e5b275f8c4657ee6a62ef9cb405546664f2de2eabcfd6db778",
+		"1.14": "kindest/node:v1.14.10@sha256:b693339da2a927949025869425e20daf80111ccabf020d4021a23c00bae29d82",
+	},
 	"v0.11.1": map[string]string{
 		"1.23": "kindest/node:v1.23.0@sha256:49824ab1727c04e56a21a5d8372a402fcd32ea51ac96a2706a12af38934f81ac",
 		"1.22": "kindest/node:v1.22.0@sha256:b8bda84bb3a190e6e028b1760d277454a72267a5454b57db34437c34a588d047",
diff --git a/test/kind-cluster-network/e2e.sh b/test/kind-cluster-network/e2e.sh
index 80134eb..ed656d2 100755
--- a/test/kind-cluster-network/e2e.sh
+++ b/test/kind-cluster-network/e2e.sh
@@ -32,8 +32,8 @@ k8sVersion=$(ctlptl get cluster "$CLUSTER_NAME" -o go-template --template='{{.st
 
 ctlptl delete -f cluster.yaml
 
-if [[ "$k8sVersion" != "v1.22.0" ]]; then
-    echo "Expected kubernetes version v1.22.0 but got $k8sVersion"
+if [[ "$k8sVersion" != "v1.22.7" ]]; then
+    echo "Expected kubernetes version v1.22.7 but got $k8sVersion"
     exit 1
 fi