Bump etcd and containerd to track k3s

Signed-off-by: Brad Davidson <[email protected]>
rancher · Jun 1, 2024 · 46a9462 · 46a9462
1 parent 537b6a0
commit 46a9462
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -114,7 +114,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.28.10-rke2r1-build20240514 AS kubernetes
-FROM rancher/hardened-containerd:v1.7.11-k3s2-build20231211 AS containerd
+FROM rancher/hardened-containerd:v1.7.17-k3s1-build20240531 AS containerd
 FROM rancher/hardened-crictl:v1.26.1-build20231010 AS crictl
 FROM rancher/hardened-runc:v1.1.12-build20240201 AS runc
 

diff --git 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 rancher/hardened-containerd:v1.7.11-k3s2-build20231211-amd64-windows AS containerd
+FROM rancher/hardened-containerd:v1.7.17-k3s1-build20240531-amd64-windows AS containerd
 FROM build as windows-runtime-collect
 ARG KUBERNETES_VERSION=dev
 

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}-build20240418
+    -X ${RKE2_PKG}/pkg/images.DefaultEtcdImage=rancher/hardened-etcd:${ETCD_VERSION}-build20240531
     -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.11.1-build20240305
     ${REGISTRY}/rancher/hardened-cluster-autoscaler:v1.8.10-build20240124
     ${REGISTRY}/rancher/hardened-dns-node-cache:1.22.28-build20240125
-    ${REGISTRY}/rancher/hardened-etcd:${ETCD_VERSION}-build20240418
+    ${REGISTRY}/rancher/hardened-etcd:${ETCD_VERSION}-build20240531
     ${REGISTRY}/rancher/hardened-k8s-metrics-server:v0.7.1-build20240401
     ${REGISTRY}/rancher/hardened-addon-resizer:1.8.20-build20240410
     ${REGISTRY}/rancher/klipper-helm:v0.8.4-build20240523

diff --git 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}-build20240418
+    -X ${RKE2_PKG}/pkg/images.DefaultEtcdImage=rancher/hardened-etcd:${ETCD_VERSION}-build20240531
     -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
@@ -33,7 +33,7 @@ RELEASE=${PROG}.${PLATFORM}
 # hardcode versions unless set specifically
 KUBERNETES_VERSION=${KUBERNETES_VERSION:-v1.28.10}
 KUBERNETES_IMAGE_TAG=${KUBERNETES_IMAGE_TAG:-v1.28.10-rke2r1-build20240514}
-ETCD_VERSION=${ETCD_VERSION:-v3.5.9-k3s1}
+ETCD_VERSION=${ETCD_VERSION:-v3.5.13-k3s1}
 PAUSE_VERSION=${PAUSE_VERSION:-3.6}
 CCM_VERSION=${CCM_VERSION:-v1.29.3-build20240515}