Skip to content
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

[release-1.28] Bump k3s/containerd/runc/ccm versions #6765

Merged
merged 2 commits into from
Sep 9, 2024
Merged

[release-1.28] Bump k3s/containerd/runc/ccm versions #6765

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9ce2e18
Bump K3s version for v1.28
brandond Sep 6, 2024
0506588
Bump containerd/runc/ccm to sync with k3s
brandond Sep 6, 2024
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
4 changes: 2 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,9 +118,9 @@ 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.28.13-rke2r1-build20240815 AS kubernetes
FROM rancher/hardened-containerd:v1.7.20-k3s1-build20240812 AS containerd
FROM rancher/hardened-containerd:v1.7.21-k3s2-build20240906 AS containerd
FROM rancher/hardened-crictl:v1.28.0-build20240812 AS crictl
FROM rancher/hardened-runc:v1.1.12-build20240812 AS runc
FROM rancher/hardened-runc:v1.1.14-build20240903 AS runc

FROM scratch AS runtime-collect
COPY --from=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 rancher/hardened-containerd:v1.7.20-k3s1-build20240812-amd64-windows AS containerd
FROM rancher/hardened-containerd:v1.7.21-k3s2-build20240906-amd64-windows AS containerd
FROM build as windows-runtime-collect
ARG KUBERNETES_VERSION=dev

Expand Down
Loading