Bump containerd and etcd to sync with k3s

Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit 3231a38)
Signed-off-by: Brad Davidson <[email protected]>

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.29.10-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.29.0-build20241008 AS crictl
 FROM rancher/hardened-runc:v1.1.14-build20240910 AS runc
 

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
 

scripts/build-binary

@@ -30,7 +30,7 @@ VERSION_FLAGS="
     -X ${K3S_PKG}/pkg/version.Version=${VERSION}
     -X ${K3S_PKG}/pkg/version.UpstreamGolang=${VERSION_GOLANG}
     -X ${RKE2_PKG}/pkg/images.DefaultRegistry=${REGISTRY}
-    -X ${RKE2_PKG}/pkg/images.DefaultEtcdImage=rancher/hardened-etcd:${ETCD_VERSION}-build20240910
+    -X ${RKE2_PKG}/pkg/images.DefaultEtcdImage=rancher/hardened-etcd:${ETCD_VERSION}-build20241106
     -X ${RKE2_PKG}/pkg/images.DefaultKubernetesImage=rancher/hardened-kubernetes:${KUBERNETES_IMAGE_TAG}
     -X ${RKE2_PKG}/pkg/images.DefaultPauseImage=rancher/mirrored-pause:${PAUSE_VERSION}
     -X ${RKE2_PKG}/pkg/images.DefaultRuntimeImage=${REPO}/${PROG}-runtime:${DOCKERIZED_VERSION}

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

scripts/build-windows-binary

@@ -31,7 +31,7 @@ VERSION_FLAGS="
     -X ${K3S_PKG}/pkg/version.Version=${VERSION}
     -X ${K3S_PKG}/pkg/version.UpstreamGolang=${VERSION_GOLANG}
     -X ${RKE2_PKG}/pkg/images.DefaultRegistry=${REGISTRY}
-    -X ${RKE2_PKG}/pkg/images.DefaultEtcdImage=rancher/hardened-etcd:${ETCD_VERSION}-build20240910
+    -X ${RKE2_PKG}/pkg/images.DefaultEtcdImage=rancher/hardened-etcd:${ETCD_VERSION}-build20241106
     -X ${RKE2_PKG}/pkg/images.DefaultKubernetesImage=${REPO}/hardened-kubernetes:${KUBERNETES_IMAGE_TAG}
     -X ${RKE2_PKG}/pkg/images.DefaultPauseImage=rancher/mirrored-pause:${PAUSE_VERSION}
     -X ${RKE2_PKG}/pkg/images.DefaultRuntimeImage=${REPO}/${PROG}-runtime:${DOCKERIZED_VERSION}-${GOOS}-${GOARCH}

scripts/version.sh

@@ -34,7 +34,7 @@ RELEASE=${PROG}.${PLATFORM}
 # hardcode versions unless set specifically
 KUBERNETES_VERSION=${KUBERNETES_VERSION:-v1.29.10}
 KUBERNETES_IMAGE_TAG=${KUBERNETES_IMAGE_TAG:-v1.29.10-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.29.10-0.20241016053521-9510ac25fefb-build20241016}