From e7e072891599e6ff887ccb784cf5989ff43c645a Mon Sep 17 00:00:00 2001
From: Brad Davidson <brad.davidson@rancher.com>
Date: Wed, 6 Nov 2024 21:38:54 +0000
Subject: [PATCH] Bump containerd and etcd to sync with k3s

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
---
 Dockerfile           | 2 +-
 Dockerfile.windows   | 2 +-
 scripts/build-images | 2 +-
 scripts/version.sh   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 8eedf9ccd5b..6f74c41f450 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -118,7 +118,7 @@ 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.31.2-rke2r1-build20241023 AS kubernetes
-FROM rancher/hardened-containerd:v1.7.22-k3s1-build20241010 AS containerd
+FROM rancher/hardened-containerd:v1.7.23-k3s1-build20241106 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/Dockerfile.windows b/Dockerfile.windows
index aac03e85152..9b0c63c1ac8 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 --platform=$BUILDPLATFORM rancher/hardened-containerd:v1.7.22-k3s1-build20241010-amd64-windows AS containerd
+FROM --platform=$BUILDPLATFORM rancher/hardened-containerd:v1.7.23-k3s1-build20241106-amd64-windows AS containerd
 FROM build as windows-runtime-collect
 ARG KUBERNETES_VERSION=dev
 
diff --git a/scripts/build-images b/scripts/build-images
index 513af14b20b..0aa28f92a57 100755
--- a/scripts/build-images
+++ b/scripts/build-images
@@ -16,7 +16,7 @@ xargs -n1 -t docker image pull --quiet << EOF >> build/images-core.txt
     ${REGISTRY}/rancher/hardened-coredns:v1.11.3-build20241018
     ${REGISTRY}/rancher/hardened-cluster-autoscaler:v1.8.11-build20241014
     ${REGISTRY}/rancher/hardened-dns-node-cache:1.23.1-build20241008
-    ${REGISTRY}/rancher/hardened-etcd:${ETCD_VERSION}-build20240910
+    ${REGISTRY}/rancher/hardened-etcd:${ETCD_VERSION}-build20241106
     ${REGISTRY}/rancher/hardened-k8s-metrics-server:v0.7.1-build20241008
     ${REGISTRY}/rancher/hardened-addon-resizer:1.8.20-build20241001
     ${REGISTRY}/rancher/klipper-helm:v0.9.3-build20241008
diff --git a/scripts/version.sh b/scripts/version.sh
index 65deb2bb916..015ea230066 100755
--- a/scripts/version.sh
+++ b/scripts/version.sh
@@ -34,7 +34,7 @@ RELEASE=${PROG}.${PLATFORM}
 # hardcode versions unless set specifically
 KUBERNETES_VERSION=${KUBERNETES_VERSION:-v1.31.2}
 KUBERNETES_IMAGE_TAG=${KUBERNETES_IMAGE_TAG:-v1.31.2-rke2r1-build20241023}
-ETCD_VERSION=${ETCD_VERSION:-v3.5.13-k3s1}
+ETCD_VERSION=${ETCD_VERSION:-v3.5.16-k3s1}
 PAUSE_VERSION=${PAUSE_VERSION:-3.6}
 CCM_VERSION=${CCM_VERSION:-v1.31.2-0.20241016053446-0955fa330f90-build20241016}