From ae9fe9a21f7449d518646e8de5a535891620b827 Mon Sep 17 00:00:00 2001 From: Brad Davidson Date: Mon, 12 Aug 2024 22:24:19 +0000 Subject: [PATCH 1/2] Bump containerd/crictl/runc versions New releases have been built with golang v1.22.6 Signed-off-by: Brad Davidson --- Dockerfile | 6 +++--- Dockerfile.windows | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index ab5eb0adbb..278256d87e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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.29.7-rke2r1-build20240717 AS kubernetes -FROM rancher/hardened-containerd:v1.7.20-k3s1-build20240802 AS containerd -FROM rancher/hardened-crictl:v1.29.0-build20231219 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.29.0-build20240812 AS crictl +FROM rancher/hardened-runc:v1.1.12-build20240812 AS runc FROM scratch AS runtime-collect COPY --from=runc \ diff --git a/Dockerfile.windows b/Dockerfile.windows index 4a5b9d6753..09558f34a7 100644 --- a/Dockerfile.windows +++ b/Dockerfile.windows @@ -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-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 From cd005c3d1f822a326475a29aee7a4743cdc1c39b Mon Sep 17 00:00:00 2001 From: Eric Ace <24485843+aceeric@users.noreply.github.com> Date: Sun, 11 Aug 2024 15:58:16 -0400 Subject: [PATCH 2/2] Modify rke2-killall.sh to handle RKE2_DATA_DIR (cherry picked from commit 00a4c5c92fb0ba702af4f81619cd3359f409e9ff) Signed-off-by: Brad Davidson --- bundle/bin/rke2-killall.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundle/bin/rke2-killall.sh b/bundle/bin/rke2-killall.sh index 371849482a..7e24bb9d35 100755 --- a/bundle/bin/rke2-killall.sh +++ b/bundle/bin/rke2-killall.sh @@ -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() {