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 ca4620076c..8ad4ce49f5 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 a9c126a6e8..b396e827a9 100755 --- a/scripts/version.sh +++ b/scripts/version.sh @@ -36,7 +36,7 @@ KUBERNETES_VERSION=${KUBERNETES_VERSION:-v1.31.0} KUBERNETES_IMAGE_TAG=${KUBERNETES_IMAGE_TAG:-v1.31.0-rke2r1-build20240815} ETCD_VERSION=${ETCD_VERSION:-v3.5.13-k3s1} PAUSE_VERSION=${PAUSE_VERSION:-3.6} -CCM_VERSION=${CCM_VERSION:-v1.31.0-build20240906} +CCM_VERSION=${CCM_VERSION:-v1.31.0-build20240910} if [ -d .git ]; then if [ -z "$GIT_TAG" ]; then