cluster: update node images for kind v0.16 (#257)

Signed-off-by: Nick Santos <[email protected]> Signed-off-by: Nick Santos <[email protected]>
tilt-dev · Sep 30, 2022 · 7f695e1 · 7f695e1
1 parent aa4b0a1
commit 7f695e1
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 7 deletions.
diff --git 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.15.0
+ENV KIND_VERSION=v0.16.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
@@ -17,7 +17,7 @@ jobs:
 
   e2e-remote-docker:
     docker:
-      - image: docker/tilt-ctlptl-ci@sha256:aed12655a66198ed10f136c7de02868a846fb4ae4b5ace2ca11f1e92d0c4e766
+      - image: docker/tilt-ctlptl-ci@sha256:21b0abd9ac7510db46d760fb0aba72e08ef1acd5363ff233c0dd1d548b27153b
     steps:
       - checkout
       - setup_remote_docker:
@@ -54,7 +54,7 @@ jobs:
           sudo mv ./minikube-linux-amd64 /usr/local/bin/minikube
       - run: |
           set -ex
-          export KIND_VERSION=v0.15.0
+          export KIND_VERSION=v0.16.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/Makefile b/Makefile
@@ -31,4 +31,4 @@ BUILDER=buildx-multiarch
 
 publish-ci-image:
 	docker buildx inspect $(BUILDER) || docker buildx create --name=$(BUILDER) --driver=docker-container --driver-opt=network=host
-	docker buildx build --builder=$(BUILDER) --platform=linux/amd64,linux/arm64 --push -t docker/tilt-ctlptl-ci -f .circleci/Dockerfile .
+	docker buildx build --builder=$(BUILDER) --pull --platform=linux/amd64,linux/arm64 --push -t docker/tilt-ctlptl-ci -f .circleci/Dockerfile .
diff --git 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.15.0
+ENV KIND_VERSION=v0.16.0
 ARG TARGETARCH
 RUN set -exu \
   && KIND_URL="https://github.com/kubernetes-sigs/kind/releases/download/${KIND_VERSION}/kind-linux-$TARGETARCH" \

diff --git a/pkg/cluster/admin_kind.go b/pkg/cluster/admin_kind.go
@@ -223,6 +223,15 @@ 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.16.0": {
+		"1.25": "kindest/node:v1.25.2@sha256:9be91e9e9cdf116809841fc77ebdb8845443c4c72fe5218f3ae9eb57fdb4bace",
+		"1.24": "kindest/node:v1.24.6@sha256:97e8d00bc37a7598a0b32d1fabd155a96355c49fa0d4d4790aab0f161bf31be1",
+		"1.23": "kindest/node:v1.23.12@sha256:9402cf1330bbd3a0d097d2033fa489b2abe40d479cc5ef47d0b6a6960613148a",
+		"1.22": "kindest/node:v1.22.15@sha256:bfd5eaae36849bfb3c1e3b9442f3da17d730718248939d9d547e86bbac5da586",
+		"1.21": "kindest/node:v1.21.14@sha256:ad5b7446dd8332439f22a1efdac73670f0da158c00f0a70b45716e7ef3fae20b",
+		"1.20": "kindest/node:v1.20.15@sha256:45d0194a8069c46483a0e509088ab9249302af561ebee76a1281a1f08ecb4ed3",
+		"1.19": "kindest/node:v1.19.16@sha256:a146f9819fece706b337d34125bbd5cb8ae4d25558427bf2fa3ee8ad231236f2",
+	},
 	"v0.15.0": {
 		"1.25": "kindest/node:v1.25.0@sha256:428aaa17ec82ccde0131cb2d1ca6547d13cf5fdabcc0bbecf749baa935387cbf",
 		"1.24": "kindest/node:v1.24.4@sha256:adfaebada924a26c2c9308edd53c6e33b3d4e453782c0063dc0028bdebaddf98",

diff --git 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.13" ]]; then
-    echo "Expected kubernetes version v1.22.13 but got $k8sVersion"
+if [[ "$k8sVersion" != "v1.22.15" ]]; then
+    echo "Expected kubernetes version v1.22.15 but got $k8sVersion"
     exit 1
 fi