From 7fc8c22ae790db2de8977acb667155e09733ada5 Mon Sep 17 00:00:00 2001 From: Brian Downs Date: Mon, 26 Feb 2024 16:22:26 -0700 Subject: [PATCH] [release-1.25] Update runc (#5509) --- Dockerfile | 4 ++-- scripts/version.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5c4ad72758..285333c9eb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -125,10 +125,10 @@ RUN rm -vf /charts/*.sh /charts/*.md /charts/chart_versions.yaml # This image includes any host level programs that we might need. All binaries # 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.25.16-rke2r1-build20231116 AS kubernetes +FROM rancher/hardened-kubernetes:v1.25.16-rke2r2-build20240221 AS kubernetes FROM rancher/hardened-containerd:v1.7.7-k3s1-build20231010 AS containerd FROM rancher/hardened-crictl:v1.26.1-build20230406 AS crictl -FROM rancher/hardened-runc:v1.1.8-build20230802 AS runc +FROM rancher/hardened-runc:v1.1.12-build20240201 AS runc FROM scratch AS runtime-collect COPY --from=runc \ diff --git a/scripts/version.sh b/scripts/version.sh index e2b34cd59d..5a23520785 100755 --- a/scripts/version.sh +++ b/scripts/version.sh @@ -32,7 +32,7 @@ PLATFORM=${GOOS}-${GOARCH} RELEASE=${PROG}.${PLATFORM} # hardcode versions unless set specifically KUBERNETES_VERSION=${KUBERNETES_VERSION:-v1.25.16} -KUBERNETES_IMAGE_TAG=${KUBERNETES_IMAGE_TAG:-v1.25.16-rke2r1-build20231116} +KUBERNETES_IMAGE_TAG=${KUBERNETES_IMAGE_TAG:-v1.25.16-rke2r2-build20240221} ETCD_VERSION=${ETCD_VERSION:-v3.5.9-k3s1} PAUSE_VERSION=${PAUSE_VERSION:-3.6} CCM_VERSION=${CCM_VERSION:-v1.26.3-build20230406}