Skip to content

[release-1.32] Bump containerd for go-cni deadlock fix #7811

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
brandond merged 1 commit into from
Feb 21, 2025
Merged

[release-1.32] Bump containerd for go-cni deadlock fix #7811

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ RUN rm -vf /charts/*.sh /charts/*.md /charts/chart_versions.yaml
# must be placed in bin/ of the file image and subdirectories of bin/ will be flattened during installation.
# This means bin/foo/bar will become bin/bar when rke2 installs this to the host
FROM rancher/hardened-kubernetes:v1.32.2-rke2r1-build20250213 AS kubernetes
FROM rancher/hardened-containerd:v2.0.2-k3s1-build20250120 AS containerd
FROM rancher/hardened-containerd:v2.0.2-k3s2-build20250221 AS containerd
FROM rancher/hardened-crictl:v1.32.0-build20250211 AS crictl
FROM rancher/hardened-runc:v1.2.4-build20250109 AS runc

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.windows
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ RUN curl -sL https://raw.githubusercontent.com/golangci/golangci-lint/master/ins
WORKDIR /source
# End Dapper stuff

FROM --platform=$BUILDPLATFORM rancher/hardened-containerd:v2.0.2-k3s1-build20250120-amd64-windows AS containerd
FROM --platform=$BUILDPLATFORM rancher/hardened-containerd:v2.0.2-k3s2-build20250221-amd64-windows AS containerd
FROM build as windows-runtime-collect
ARG KUBERNETES_VERSION=dev

Expand Down