Bump crictl and etcd tags

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
rancher · Feb 11, 2025 · 0932111 · 0932111
1 parent a89e66c
commit 0932111
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -118,7 +118,7 @@ RUN rm -vf /charts/*.sh /charts/*.md /charts/chart_versions.yaml
 # This means bin/foo/bar will become bin/bar when rke2 installs this to the host
 FROM rancher/hardened-kubernetes:v1.32.1-rke2r1-build20250115 AS kubernetes
 FROM rancher/hardened-containerd:v2.0.2-k3s1-build20250120 AS containerd
-FROM rancher/hardened-crictl:v1.31.1-build20241011 AS crictl
+FROM rancher/hardened-crictl:v1.32.0-build20250211 AS crictl
 FROM rancher/hardened-runc:v1.2.4-build20250109 AS runc
 
 FROM scratch AS runtime-collect

diff --git 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}-build20241106
+    -X ${RKE2_PKG}/pkg/images.DefaultEtcdImage=rancher/hardened-etcd:${ETCD_VERSION}-build20250210
     -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
@@ -16,7 +16,7 @@ xargs -n1 -t docker image pull --quiet << EOF >> build/images-core.txt
     ${REGISTRY}/rancher/hardened-coredns:v1.12.0-build20241126
     ${REGISTRY}/rancher/hardened-cluster-autoscaler:v1.9.0-build20241126
     ${REGISTRY}/rancher/hardened-dns-node-cache:1.24.0-build20241211
-    ${REGISTRY}/rancher/hardened-etcd:${ETCD_VERSION}-build20241106
+    ${REGISTRY}/rancher/hardened-etcd:${ETCD_VERSION}-build20250210
     ${REGISTRY}/rancher/hardened-k8s-metrics-server:v0.7.2-build20250110
     ${REGISTRY}/rancher/hardened-addon-resizer:1.8.22-build20250110
     ${REGISTRY}/rancher/klipper-helm:v0.9.4-build20250113

diff --git 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.32.1}
 KUBERNETES_IMAGE_TAG=${KUBERNETES_IMAGE_TAG:-v1.32.1-rke2r1-build20250115}
-ETCD_VERSION=${ETCD_VERSION:-v3.5.16-k3s1}
+ETCD_VERSION=${ETCD_VERSION:-v3.5.18-k3s1}
 PAUSE_VERSION=${PAUSE_VERSION:-3.6}
 CCM_VERSION=${CCM_VERSION:-v1.32.0-rc3.0.20241220224140-68fbd1a6b543-build20250101}