From 1326bec6585213a194b6f7949454e8754b8923b0 Mon Sep 17 00:00:00 2001
From: Brooks Newberry <brooks@newberry.com>
Date: Wed, 23 Oct 2024 10:23:42 -0700
Subject: [PATCH] [release-1.30] update hardened chart images (#7097)

Signed-off-by: Brooks Newberry <brooks@newberry.com>
---
 charts/chart_versions.yaml | 12 ++++++------
 scripts/build-images       | 20 ++++++++++----------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/charts/chart_versions.yaml b/charts/chart_versions.yaml
index 0d301cf601..451d48216c 100644
--- a/charts/chart_versions.yaml
+++ b/charts/chart_versions.yaml
@@ -2,7 +2,7 @@ charts:
   - version: 1.16.201
     filename: /charts/rke2-cilium.yaml
     bootstrap: true
-  - version: v3.28.2-build2024100300
+  - version: v3.28.2-build2024101601
     filename: /charts/rke2-canal.yaml
     bootstrap: true
   - version: v3.28.200
@@ -11,10 +11,10 @@ charts:
   - version: v3.28.200
     filename: /charts/rke2-calico-crd.yaml
     bootstrap: true
-  - version: 1.33.000
+  - version: 1.33.003
     filename: /charts/rke2-coredns.yaml
     bootstrap: true
-  - version: 4.10.500
+  - version: 4.10.501
     filename: /charts/rke2-ingress-nginx.yaml
     bootstrap: false
   - version: 27.0.200
@@ -23,13 +23,13 @@ charts:
   - version: 27.0.200
     filename: /charts/rke2-traefik-crd.yaml
     bootstrap: false
-  - version: 3.12.003
+  - version: 3.12.004
     filename: /charts/rke2-metrics-server.yaml
     bootstrap: false
-  - version: v4.1.201
+  - version: v4.1.205
     filename: /charts/rke2-multus.yaml
     bootstrap: true
-  - version: v0.25.701
+  - version: v0.25.704
     filename: /charts/rke2-flannel.yaml
     bootstrap: true
   - version: 1.8.000
diff --git a/scripts/build-images b/scripts/build-images
index 58a2cb457e..0f2c0b266f 100755
--- a/scripts/build-images
+++ b/scripts/build-images
@@ -13,17 +13,17 @@ EOF
 
 xargs -n1 -t docker image pull --quiet << EOF >> build/images-core.txt
     ${REGISTRY}/rancher/hardened-kubernetes:${KUBERNETES_IMAGE_TAG}
-    ${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-coredns:v1.11.1-build20241008
+    ${REGISTRY}/rancher/hardened-cluster-autoscaler:v1.8.11-build20241014
+    ${REGISTRY}/rancher/hardened-dns-node-cache:1.23.1-build20241008
     ${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/hardened-k8s-metrics-server:v0.7.1-build20241008
+    ${REGISTRY}/rancher/hardened-addon-resizer:1.8.20-build20241001
     ${REGISTRY}/rancher/klipper-helm:v0.9.3-build20241008
     ${REGISTRY}/rancher/klipper-lb:v0.4.9
     ${REGISTRY}/rancher/mirrored-pause:${PAUSE_VERSION}
     ${REGISTRY}/rancher/mirrored-ingress-nginx-kube-webhook-certgen:v1.4.4
-    ${REGISTRY}/rancher/nginx-ingress-controller:v1.10.5-hardened1
+    ${REGISTRY}/rancher/nginx-ingress-controller:v1.10.5-hardened3
     ${REGISTRY}/rancher/rke2-cloud-provider:${CCM_VERSION}
     ${REGISTRY}/rancher/mirrored-sig-storage-snapshot-controller:v8.1.0
     ${REGISTRY}/rancher/mirrored-sig-storage-snapshot-validation-webhook:v8.1.0
@@ -34,8 +34,8 @@ xargs -n1 -t docker image pull --quiet << EOF > build/images-traefik.txt
 EOF
 
 xargs -n1 -t docker image pull --quiet << EOF > build/images-canal.txt
-    ${REGISTRY}/rancher/hardened-calico:v3.28.2-build20241003
-    ${REGISTRY}/rancher/hardened-flannel:v0.25.7-build20241007
+    ${REGISTRY}/rancher/hardened-calico:v3.28.2-build20241016
+    ${REGISTRY}/rancher/hardened-flannel:v0.25.7-build20241008
 EOF
 
 if [ "${GOARCH}" != "s390x" ]; then
@@ -81,9 +81,9 @@ EOF
 fi
 
 xargs -n1 -t docker image pull --quiet << EOF > build/images-multus.txt
-    ${REGISTRY}/rancher/hardened-multus-cni:v4.1.2-build20241009
+    ${REGISTRY}/rancher/hardened-multus-cni:v4.1.2-build20241011
     ${REGISTRY}/rancher/hardened-cni-plugins:v1.5.1-build20241009
-    ${REGISTRY}/rancher/hardened-whereabouts:v0.8.0-build20240910
+    ${REGISTRY}/rancher/hardened-whereabouts:v0.8.0-build20241011
     ${REGISTRY}/rancher/mirrored-library-busybox:1.36.1
 EOF