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

Jump to bottom

[release-1.28] Bump containerd/crictl/runc versions #6554

Merged
merged 2 commits into from
Aug 13, 2024
Merged

[release-1.28] Bump containerd/crictl/runc versions #6554

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
c1759f3
Bump containerd/crictl/runc versions
brandond Aug 12, 2024
ef6363a
Modify rke2-killall.sh to handle RKE2_DATA_DIR
aceeric Aug 11, 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
6 changes: 3 additions & 3 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.12-rke2r1-build20240717 AS kubernetes
FROM rancher/hardened-containerd:v1.7.20-k3s1-build20240802 AS containerd
FROM rancher/hardened-crictl:v1.26.1-build20231010 AS crictl
FROM rancher/hardened-runc:v1.1.12-build20240201 AS runc
FROM rancher/hardened-containerd:v1.7.20-k3s1-build20240812 AS containerd
FROM rancher/hardened-crictl:v1.28.0-build20240812 AS crictl
FROM rancher/hardened-runc:v1.1.12-build20240812 AS runc

FROM scratch AS runtime-collect
COPY --from=runc \
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.windows
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,12 @@ 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-build20240802-amd64-windows AS containerd
FROM rancher/hardened-containerd:v1.7.20-k3s1-build20240812-amd64-windows AS containerd
FROM build as windows-runtime-collect
ARG KUBERNETES_VERSION=dev

# windows runtime image
ENV CRICTL_VERSION="v1.27.0"
ENV CRICTL_VERSION="v1.28.0"
ENV CALICO_VERSION="v3.28.1"
ENV CNI_PLUGIN_VERSION="v1.4.1"
ENV FLANNEL_VERSION="v0.25.5"
Expand Down
2 changes: 1 addition & 1 deletion bundle/bin/rke2-killall.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ killtree() {
}

getshims() {
COLUMNS=2147483647 ps -e -o pid= -o args= | sed -e 's/^ *//; s/\s\s*/\t/;' | grep -w 'rke2/data/[^/]*/bin/containerd-shim' | cut -f1
COLUMNS=2147483647 ps -e -o pid= -o args= | sed -e 's/^ *//; s/\s\s*/\t/;' | grep -w "${RKE2_DATA_DIR}"'/data/[^/]*/bin/containerd-shim' | cut -f1
}

do_unmount_and_remove() {
Expand Down