Skip to content

Commit

Permalink
Bump K3s version for containerd-2
Browse files Browse the repository at this point in the history
Updates k3s: brandond/k3s@d0ea741...1bbd7b0

Signed-off-by: Brad Davidson <[email protected]>
  • Loading branch information
brandond committed Jan 18, 2025
1 parent 649521a commit a1638f4
Show file tree
Hide file tree
Showing 5 changed files with 268 additions and 239 deletions.
4 changes: 1 addition & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,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.1-rke2r1-build20250115 AS kubernetes
FROM rancher/hardened-containerd:v1.7.23-k3s2-build20241203 AS containerd
FROM rancher/hardened-containerd:v2.0.2-k3s1-build20250118 AS containerd
FROM rancher/hardened-crictl:v1.31.1-build20241011 AS crictl
FROM rancher/hardened-runc:v1.2.4-build20250109 AS runc

Expand All @@ -130,8 +130,6 @@ COPY --from=crictl \
/bin/
COPY --from=containerd \
/usr/local/bin/containerd \
/usr/local/bin/containerd-shim \
/usr/local/bin/containerd-shim-runc-v1 \
/usr/local/bin/containerd-shim-runc-v2 \
/usr/local/bin/ctr \
/bin/
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.windows
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ RUN curl -sL https://raw.githubusercontent.com/golangci/golangci-lint/master/ins
WORKDIR /source
# End Dapper stuff

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

Expand Down
Loading

0 comments on commit a1638f4

Please sign in to comment.