From d53abf6437bae5d2672685fb97982e3c8aa85d90 Mon Sep 17 00:00:00 2001 From: Hajime Tazaki Date: Wed, 24 Jul 2024 13:42:48 +0900 Subject: [PATCH] update kind version Signed-off-by: Hajime Tazaki --- .github/workflows/ci.yml | 7 ++++--- k8s/Dockerfile | 3 ++- k8s/ukontainer-runtimeclass.yaml | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 59504f4..858b333 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -63,7 +63,8 @@ jobs: TRAVIS_OS_NAME: ${{ matrix.os_alias }} TRAVIS_ARCH: ${{ matrix.arch }} REGISTRY: ghcr.io/ - KIND_IMG_VERSION: v1.21.1 + KIND_IMG_VERSION: v1.27.0 + KIND_VERSION: v0.19.0 CC: ${{ matrix.cc }} CGO_ENABLED: ${{ matrix.cgo_enabled }} GOOS: ${{matrix.goos}} @@ -210,7 +211,7 @@ jobs: name: kind setup with default CNI if: runner.os == 'linux' && matrix.arch == 'amd64' with: - version: "v0.11.1" + version: "${{ env.KIND_VERSION }}" config: "k8s/kind-cluster.yaml" image: "ukontainer/node-runu:${{ env.KIND_IMG_VERSION }}" @@ -226,7 +227,7 @@ jobs: name: kind setup with calico if: runner.os == 'linux' && matrix.arch == 'amd64' with: - version: "v0.11.1" + version: "${{ env.KIND_VERSION }}" config: "k8s/kind-cluster-calico.yaml" image: "ukontainer/node-runu:${{ env.KIND_IMG_VERSION }}" wait: "0s" diff --git a/k8s/Dockerfile b/k8s/Dockerfile index 9775a19..0e22d96 100644 --- a/k8s/Dockerfile +++ b/k8s/Dockerfile @@ -1,4 +1,5 @@ -FROM kindest/node:v1.21.1 +# XXX v1.27.0 is the version that `containerd-shim` file is included +FROM kindest/node:v1.27.0 COPY ./runu /usr/bin/runu COPY ./libc.so /usr/lib/runu/ diff --git a/k8s/ukontainer-runtimeclass.yaml b/k8s/ukontainer-runtimeclass.yaml index 5726137..8e01978 100644 --- a/k8s/ukontainer-runtimeclass.yaml +++ b/k8s/ukontainer-runtimeclass.yaml @@ -1,4 +1,4 @@ -apiVersion: node.k8s.io/v1beta1 +apiVersion: node.k8s.io/v1 kind: RuntimeClass metadata: name: ukontainer