Skip to content

chore: v1.1.5 bump #149

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stevensbkang merged 3 commits into from
May 12, 2026
Merged

chore: v1.1.5 bump #149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ff69815
chore: v1.1.5 bump
stevensbkang May 7, 2026
016e7d6
Merge branch 'develop' into chore/ks-53/release-v1.1.5
stevensbkang May 11, 2026
1d42a32
fix(containerd): added missing plugins
stevensbkang May 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ build-using-image:
-e GOCACHE=/root/.cache/go-build \
-e GOMODCACHE=/go/pkg/mod \
-e CGO_ENABLED=1 -e CGO_CFLAGS="$(CGO_CFLAGS_EXTRA)" -e GOOS=$(GOOS) -e GOARCH=$(GOARCH) -e VERSION=$(VERSION) \
registry.k8s.io/build-image/kube-cross:v1.36.0-go1.26.1-bullseye.0 \
registry.k8s.io/build-image/kube-cross:v1.36.0-go1.26.2-bullseye.0 \
make build

.PHONY: build-using-alpine
Expand Down
4 changes: 2 additions & 2 deletions build/containerd.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Containerd cross-compilation for arm32 on native host
FROM golang:1.24-bullseye
FROM golang:1.26-bullseye

# Install cross-compilation toolchain and dependencies
RUN dpkg --add-architecture armhf && \
Expand Down Expand Up @@ -33,7 +33,7 @@ ENV PKG_CONFIG_PATH=/usr/lib/arm-linux-gnueabihf/pkgconfig
ENV PKG_CONFIG_LIBDIR=/usr/lib/arm-linux-gnueabihf/pkgconfig

# Clone containerd repository
ARG CONTAINERD_VERSION=v2.0.5
ARG CONTAINERD_VERSION=v2.2.3
RUN git clone https://github.com/containerd/containerd.git /go/src/github.com/containerd/containerd
WORKDIR /go/src/github.com/containerd/containerd

Expand Down
8 changes: 4 additions & 4 deletions build/download-deps.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
OS="linux"
ARCH="amd64"
# Set versions
CONTAINERD_VERSION="2.1.5"
CONTAINERD_VERSION="2.2.3"
CRUN_VERSION="1.26"
CNI_VERSION="v1.9.0"
PORTAINER_AGENT_VERSION="2.39.1"
COREDNS_VERSION="1.14.1"
LOCAL_PATH_PROVISIONER_VERSION="v0.0.34"
PORTAINER_AGENT_VERSION="2.39.2"
COREDNS_VERSION="1.14.3"
LOCAL_PATH_PROVISIONER_VERSION="v0.0.36"
PAUSE_IMAGE_VERSION="3.10"

# Offline mode embeds all OCI images; online mode (default) skips optional images
Expand Down
164 changes: 85 additions & 79 deletions go.mod
View file
Open in desktop

Large diffs are not rendered by default.

289 changes: 147 additions & 142 deletions go.sum
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pkg/runtime/containerd/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ func (s *service) generateContainerdConfig() map[string]any {
},
},
"cni": map[string]any{
"bin_dir": s.containerdCNIPluginsDir,
"bin_dirs": []string{s.containerdCNIPluginsDir},
"conf_dir": types.DefaultStandardCNIConfDir,
},
},
Expand Down
2 changes: 2 additions & 0 deletions pkg/runtime/containerd/plugins.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import (
_ "github.com/containerd/containerd/v2/plugins/imageverifier"
_ "github.com/containerd/containerd/v2/plugins/leases"
_ "github.com/containerd/containerd/v2/plugins/metadata"
_ "github.com/containerd/containerd/v2/plugins/mount"
_ "github.com/containerd/containerd/v2/plugins/sandbox"
_ "github.com/containerd/containerd/v2/plugins/services/containers"
_ "github.com/containerd/containerd/v2/plugins/services/content"
Expand All @@ -27,6 +28,7 @@ import (
_ "github.com/containerd/containerd/v2/plugins/services/snapshots"
_ "github.com/containerd/containerd/v2/plugins/services/tasks"
_ "github.com/containerd/containerd/v2/plugins/services/version"
_ "github.com/containerd/containerd/v2/plugins/services/warning"
_ "github.com/containerd/containerd/v2/plugins/snapshots/overlay/plugin"
_ "github.com/containerd/containerd/v2/plugins/transfer"
)