From 69ae75f102fcac73d00b0f25217fdd4d0f23e7a1 Mon Sep 17 00:00:00 2001 From: Brian Downs Date: Wed, 6 Mar 2024 14:12:49 -0700 Subject: [PATCH] update 1.28 to r2 (#5566) --- Dockerfile | 2 +- scripts/version.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index d2b4d77d7d..d2eba3d1ec 100644 --- a/Dockerfile +++ b/Dockerfile @@ -113,7 +113,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.28.7-rke2r1-build20240214 AS kubernetes +FROM rancher/hardened-kubernetes:v1.28.7-rke2r2-build20240304 AS kubernetes FROM rancher/hardened-containerd:v1.7.11-k3s2-build20231211 AS containerd FROM rancher/hardened-crictl:v1.26.1-build20231010 AS crictl FROM rancher/hardened-runc:v1.1.12-build20240201 AS runc diff --git a/scripts/version.sh b/scripts/version.sh index 229fd04f0b..e58f033257 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.28.7} -KUBERNETES_IMAGE_TAG=${KUBERNETES_IMAGE_TAG:-v1.28.7-rke2r1-build20240214} +KUBERNETES_IMAGE_TAG=${KUBERNETES_IMAGE_TAG:-v1.28.7-rke2r2-build20240304} ETCD_VERSION=${ETCD_VERSION:-v3.5.9-k3s1} PAUSE_VERSION=${PAUSE_VERSION:-3.6} CCM_VERSION=${CCM_VERSION:-v1.28.2-build20231016}