From bdb453e8c8612c9944988c275ce62f883d5dfc58 Mon Sep 17 00:00:00 2001 From: Hajime Tazaki Date: Thu, 25 Jul 2024 15:39:48 +0900 Subject: [PATCH] shim: use v2 shim for kind/containerd Signed-off-by: Hajime Tazaki --- .github/workflows/ci.yml | 1 + k8s/Dockerfile | 1 + k8s/kind-cluster-calico.yaml | 3 +-- k8s/kind-cluster.yaml | 3 +-- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7e25ff3..b49b1ac 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -208,6 +208,7 @@ jobs: # Build kind node docker image cp `which runu` k8s/ + cp `which containerd-shim-runu-v2` k8s/ cd k8s docker build -t ukontainer/node-runu:$KIND_IMG_VERSION . cd .. diff --git a/k8s/Dockerfile b/k8s/Dockerfile index cf51645..e7886c5 100644 --- a/k8s/Dockerfile +++ b/k8s/Dockerfile @@ -4,3 +4,4 @@ FROM kindest/node:v1.27.0 COPY ./runu /usr/bin/runu COPY ./libc.so /usr/lib/runu/ COPY ./lkick /usr/lib/runu/ +COPY ./containerd-shim-runu-v2 /usr/local/bin/containerd-shim-runu-v2 diff --git a/k8s/kind-cluster-calico.yaml b/k8s/kind-cluster-calico.yaml index aca468c..91735e0 100644 --- a/k8s/kind-cluster-calico.yaml +++ b/k8s/kind-cluster-calico.yaml @@ -5,5 +5,4 @@ networking: containerdConfigPatches: - |- [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runu] - runtime_type = "io.containerd.runtime.v1.linux" - runtime_engine = "/usr/bin/runu" + runtime_type = "io.containerd.runu.v2" diff --git a/k8s/kind-cluster.yaml b/k8s/kind-cluster.yaml index 4d4eae4..cb8a48f 100644 --- a/k8s/kind-cluster.yaml +++ b/k8s/kind-cluster.yaml @@ -3,5 +3,4 @@ apiVersion: kind.x-k8s.io/v1alpha4 containerdConfigPatches: - |- [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runu] - runtime_type = "io.containerd.runtime.v1.linux" - runtime_engine = "/usr/bin/runu" + runtime_type = "io.containerd.runu.v2"