From b208af8c84e342b391801a8a287ff13096613769 Mon Sep 17 00:00:00 2001
From: Brad Davidson <brad.davidson@rancher.com>
Date: Tue, 10 Sep 2024 22:28:58 +0000
Subject: [PATCH] Bump etcd and CCM builds

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

diff --git a/scripts/build-binary b/scripts/build-binary
index 74d8557384..18701483b9 100755
--- a/scripts/build-binary
+++ b/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}-build20240531
+    -X ${RKE2_PKG}/pkg/images.DefaultEtcdImage=rancher/hardened-etcd:${ETCD_VERSION}-build20240910
     -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}
diff --git a/scripts/build-images b/scripts/build-images
index 2e89427ef4..063c51c209 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.1-build20240910
     ${REGISTRY}/rancher/hardened-cluster-autoscaler:v1.8.11-build20240910
     ${REGISTRY}/rancher/hardened-dns-node-cache:1.23.1-build20240910
-    ${REGISTRY}/rancher/hardened-etcd:${ETCD_VERSION}-build20240531
+    ${REGISTRY}/rancher/hardened-etcd:${ETCD_VERSION}-build20240910
     ${REGISTRY}/rancher/hardened-k8s-metrics-server:v0.7.1-build20240910
     ${REGISTRY}/rancher/hardened-addon-resizer:1.8.20-build20240910
     ${REGISTRY}/rancher/klipper-helm:v0.9.2-build20240828
diff --git a/scripts/build-windows-binary b/scripts/build-windows-binary
index daaa8d81c5..6544d7035b 100755
--- a/scripts/build-windows-binary
+++ b/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}-build20240531
+    -X ${RKE2_PKG}/pkg/images.DefaultEtcdImage=rancher/hardened-etcd:${ETCD_VERSION}-build20240910
     -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}
diff --git a/scripts/version.sh b/scripts/version.sh
index 99ee89ee9c..f18ff7f0a5 100755
--- a/scripts/version.sh
+++ b/scripts/version.sh
@@ -36,7 +36,7 @@ KUBERNETES_VERSION=${KUBERNETES_VERSION:-v1.29.8}
 KUBERNETES_IMAGE_TAG=${KUBERNETES_IMAGE_TAG:-v1.29.8-rke2r1-build20240815}
 ETCD_VERSION=${ETCD_VERSION:-v3.5.13-k3s1}
 PAUSE_VERSION=${PAUSE_VERSION:-3.6}
-CCM_VERSION=${CCM_VERSION:-v1.29.8-build20240906}
+CCM_VERSION=${CCM_VERSION:-v1.29.8-build20240910}
 
 if [ -d .git ]; then
     if [ -z "$GIT_TAG" ]; then