From a1d5456aec21b761ac85f0348a1926290e48c38b Mon Sep 17 00:00:00 2001 From: Brian Downs Date: Wed, 16 Oct 2024 14:57:48 -0700 Subject: [PATCH] October 2024 R2 update (#7066) --- Dockerfile | 2 +- scripts/version.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 57174a84d4..792e2e5d74 100644 --- a/Dockerfile +++ b/Dockerfile @@ -117,7 +117,7 @@ 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.31.1-rke2r1-build20240912 AS kubernetes +FROM rancher/hardened-kubernetes:v1.31.1-rke2r2-build20241014 AS kubernetes FROM rancher/hardened-containerd:v1.7.22-k3s1-build20241010 AS containerd FROM rancher/hardened-crictl:v1.31.1-build20241011 AS crictl FROM rancher/hardened-runc:v1.1.14-build20240910 AS runc diff --git a/scripts/version.sh b/scripts/version.sh index fc4635e9db..b78b038f43 100755 --- a/scripts/version.sh +++ b/scripts/version.sh @@ -33,7 +33,7 @@ PLATFORM=${GOOS}-${GOARCH} RELEASE=${PROG}.${PLATFORM} # hardcode versions unless set specifically KUBERNETES_VERSION=${KUBERNETES_VERSION:-v1.31.1} -KUBERNETES_IMAGE_TAG=${KUBERNETES_IMAGE_TAG:-v1.31.1-rke2r1-build20240912} +KUBERNETES_IMAGE_TAG=${KUBERNETES_IMAGE_TAG:-v1.31.1-rke2r2-build20241014} ETCD_VERSION=${ETCD_VERSION:-v3.5.13-k3s1} PAUSE_VERSION=${PAUSE_VERSION:-3.6} CCM_VERSION=${CCM_VERSION:-v1.31.2-0.20241016053446-0955fa330f90-build20241016}