From c354cd27961df2284bdcb97fa81dbc6808006835 Mon Sep 17 00:00:00 2001
From: Hajime Tazaki <thehajime@gmail.com>
Date: Mon, 6 Sep 2021 23:34:38 +0900
Subject: [PATCH] k8s: bump up kind version to v0.11.1

We also update the base image version to v1.21.1.

https://github.com/kubernetes-sigs/kind/issues/2240

Signed-off-by: Hajime Tazaki <thehajime@gmail.com>
---
 k8s/Dockerfile   | 2 +-
 test/k8s-test.sh | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/k8s/Dockerfile b/k8s/Dockerfile
index e22fdff..9775a19 100644
--- a/k8s/Dockerfile
+++ b/k8s/Dockerfile
@@ -1,4 +1,4 @@
-FROM kindest/node:v1.17.0
+FROM kindest/node:v1.21.1
 
 COPY ./runu /usr/bin/runu
 COPY ./libc.so /usr/lib/runu/
diff --git a/test/k8s-test.sh b/test/k8s-test.sh
index 0b8739f..9dcfad8 100644
--- a/test/k8s-test.sh
+++ b/test/k8s-test.sh
@@ -2,7 +2,8 @@
 
 . $(dirname "${BASH_SOURCE[0]}")/common.sh
 
-KIND_VERSION=v0.7.0
+KIND_VERSION=v0.11.1
+KIND_IMG_VERSION=v1.21.1
 
 # XXX: need multi-arch image build
 if [ $TRAVIS_ARCH != "amd64" ] || [ $TRAVIS_OS_NAME != "linux" ] ; then
@@ -22,7 +23,7 @@ cp $RUNU_AUX_DIR/lkick k8s/
 cp $TRAVIS_HOME/gopath/bin/${RUNU_PATH}runu k8s/
 cd k8s
 echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
-docker build -t thehajime/node-runu:v1.17.0 .
+docker build -t thehajime/node-runu:$KIND_IMG_VERSION .
 cd ..
 
 fold_end k8s.test.0 ""
@@ -41,7 +42,7 @@ fold_end k8s.test.1 ""
 
 
 fold_start k8s.test.2 "k8s: kind setup"
-kind create cluster --image thehajime/node-runu:v1.17.0 --config k8s/kind-cluster.yaml
+kind create cluster --image thehajime/node-runu:$KIND_IMG_VERSION --config k8s/kind-cluster.yaml
 kubectl get pods -o wide -A
 kubectl get nodes -o wide -A