Bump versions for etcd, containerd, runc

Also bump rke2-snapshot-validation-webhook chart Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
brandond · Aug 2, 2023 · 818eace · 818eace
1 parent 4acdca4
commit 818eace
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -119,17 +119,17 @@ RUN CHART_VERSION="0.2.200"                   CHART_FILE=/charts/harvester-cloud
 RUN CHART_VERSION="0.1.1600"                  CHART_FILE=/charts/harvester-csi-driver.yaml     CHART_BOOTSTRAP=true /charts/build-chart.sh
 RUN CHART_VERSION="1.7.202"                   CHART_FILE=/charts/rke2-snapshot-controller.yaml CHART_BOOTSTRAP=false /charts/build-chart.sh
 RUN CHART_VERSION="1.7.202"                   CHART_FILE=/charts/rke2-snapshot-controller-crd.yaml CHART_BOOTSTRAP=false /charts/build-chart.sh
-RUN CHART_VERSION="1.7.101"                   CHART_FILE=/charts/rke2-snapshot-validation-webhook.yaml CHART_BOOTSTRAP=false /charts/build-chart.sh
+RUN CHART_VERSION="1.7.300"                   CHART_FILE=/charts/rke2-snapshot-validation-webhook.yaml CHART_BOOTSTRAP=false /charts/build-chart.sh
 RUN rm -vf /charts/*.sh /charts/*.md
 
 # rke2-runtime image
 # This image includes any host level programs that we might need. All binaries
 # 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.27.4-rke2r1-build20230719 AS kubernetes
-FROM rancher/hardened-containerd:v1.7.1-k3s1-build20230606 AS containerd
+FROM rancher/hardened-containerd:v1.7.3-k3s1-build20230802 AS containerd
 FROM rancher/hardened-crictl:v1.26.1-build20230606 AS crictl
-FROM rancher/hardened-runc:v1.1.7-build20230606 AS runc
+FROM rancher/hardened-runc:v1.1.8-build20230802 AS runc
 
 FROM scratch AS runtime-collect
 COPY --from=runc \

diff --git a/scripts/build-binary b/scripts/build-binary
@@ -24,7 +24,7 @@ VERSION_FLAGS="
     -X ${K3S_PKG}/pkg/version.Program=${PROG}
     -X ${K3S_PKG}/pkg/version.Version=${VERSION}
     -X ${RKE2_PKG}/pkg/images.DefaultRegistry=${REGISTRY}
-    -X ${RKE2_PKG}/pkg/images.DefaultEtcdImage=rancher/hardened-etcd:${ETCD_VERSION}-build20230609
+    -X ${RKE2_PKG}/pkg/images.DefaultEtcdImage=rancher/hardened-etcd:${ETCD_VERSION}-build20230802
     -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.10.1-build20230607
     ${REGISTRY}/rancher/hardened-cluster-autoscaler:v1.8.6-build20230609
     ${REGISTRY}/rancher/hardened-dns-node-cache:1.22.20-build20230607
-    ${REGISTRY}/rancher/hardened-etcd:${ETCD_VERSION}-build20230609
+    ${REGISTRY}/rancher/hardened-etcd:${ETCD_VERSION}-build20230802
     ${REGISTRY}/rancher/hardened-k8s-metrics-server:v0.6.3-build20230607
     ${REGISTRY}/rancher/klipper-helm:v0.8.0-build20230510
     ${REGISTRY}/rancher/klipper-lb:v0.4.4

diff --git a/scripts/build-windows-binary b/scripts/build-windows-binary
@@ -30,7 +30,7 @@ VERSION_FLAGS="
     -X ${K3S_PKG}/pkg/version.Program=${PROG}
     -X ${K3S_PKG}/pkg/version.Version=${VERSION}
     -X ${RKE2_PKG}/pkg/images.DefaultRegistry=${REGISTRY}
-    -X ${RKE2_PKG}/pkg/images.DefaultEtcdImage=rancher/hardened-etcd:${ETCD_VERSION}-build20221129
+    -X ${RKE2_PKG}/pkg/images.DefaultEtcdImage=rancher/hardened-etcd:${ETCD_VERSION}-build20230802
     -X ${RKE2_PKG}/pkg/images.DefaultKubernetesImage=${REPO}/hardened-kubernetes:${KUBERNETES_IMAGE_TAG}
     -X ${RKE2_PKG}/pkg/images.DefaultPauseImage=rancher/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.27.4}
 KUBERNETES_IMAGE_TAG=${KUBERNETES_IMAGE_TAG:-v1.27.4-rke2r1-build20230719}
-ETCD_VERSION=${ETCD_VERSION:-v3.5.7-k3s1}
+ETCD_VERSION=${ETCD_VERSION:-v3.5.9-k3s1}
 PAUSE_VERSION=${PAUSE_VERSION:-3.6}
 CCM_VERSION=${CCM_VERSION:-v1.26.3-build20230608}