Skip to content

Commit fb4c03b

Browse files
authored
Update linuxkit/init; Disable containerd CRI plugin (#293)
## Description - Update linuxkit/init to the latest release. We were using an init container from a year ago. - Disable the CRI plugin for containerd. This is not needed for Linuxkit. The cri plugin is a Kubernetes thing. This removes warning and error messages that show up and have confused users as real issues. - Add a config file (/etc/runtime-config.toml) for the init system to use when starting containerd. This will send logs to files. Fixes: # ## How Has This Been Tested? ## How are existing users impacted? What migration steps/scripts do we need? ## Checklist: I have: - [ ] updated the documentation and/or roadmap (if required) - [ ] added unit or e2e tests - [ ] provided instructions on how to upgrade
2 parents 84801bb + 665a907 commit fb4c03b

File tree

4 files changed

+7
-3
lines changed

4 files changed

+7
-3
lines changed

images/hook-containerd/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ENV CONTAINERD_REPO=https://github.com/containerd/containerd.git
1010
ENV CONTAINERD_COMMIT=v2.1.3
1111
ENV NERDCTL_VERSION=2.1.2
1212
ENV GOPATH=/go
13-
RUN apk add go=1.24.4-r0 git
13+
RUN apk add go=1.24.6-r0 git
1414
RUN mkdir -p $GOPATH/src/github.com/containerd && \
1515
cd $GOPATH/src/github.com/containerd && \
1616
git clone https://github.com/containerd/containerd.git && \

images/hook-containerd/etc/containerd/config.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ version = 3
33
root = '/var/lib/containerd'
44
state = '/run/containerd'
55
temp = ''
6-
disabled_plugins = []
6+
disabled_plugins = ["io.containerd.grpc.v1.cri","io.containerd.internal.v1.opt"]
77
required_plugins = []
88
oom_score = 0
99
imports = []
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# This file is used by linuxkit/init to configure the start up of containerd
2+
# https://github.com/linuxkit/linuxkit/blob/master/pkg/init/cmd/service/system_init.go
3+
stdout = "/var/log/containerd.out.log"
4+
stderr = "/var/log/containerd.err.log"

linuxkit-templates/hook.template.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ kernel:
2020

2121
init:
2222
# this init container sha has support for volumes
23-
- linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b
23+
- linuxkit/init:v1.1.0
2424
- "${HOOK_CONTAINER_RUNC_IMAGE}"
2525
- "${HOOK_CONTAINER_CONTAINERD_IMAGE}"
2626
- linuxkit/ca-certificates:v1.0.0

0 commit comments

Comments
 (0)