From a0bbe6010f51e7c009c3a2032d9ea6bd3a7cae75 Mon Sep 17 00:00:00 2001 From: Michael Fritch Date: Thu, 10 Oct 2024 07:36:36 -0600 Subject: [PATCH 1/2] Update multus to `v4.1.2` Signed-off-by: Michael Fritch --- charts/chart_versions.yaml | 2 +- scripts/build-images | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/chart_versions.yaml b/charts/chart_versions.yaml index 7fec3ba5e1..0e8c1e8502 100644 --- a/charts/chart_versions.yaml +++ b/charts/chart_versions.yaml @@ -26,7 +26,7 @@ charts: - version: 3.12.003 filename: /charts/rke2-metrics-server.yaml bootstrap: false - - version: v4.1.001 + - version: v4.1.200 filename: /charts/rke2-multus.yaml bootstrap: true - version: v0.25.700 diff --git a/scripts/build-images b/scripts/build-images index 85c0fb8fa7..8a1f37f6bb 100755 --- a/scripts/build-images +++ b/scripts/build-images @@ -81,7 +81,7 @@ EOF fi xargs -n1 -t docker image pull --quiet << EOF > build/images-multus.txt - ${REGISTRY}/rancher/hardened-multus-cni:v4.1.0-build20240910 + ${REGISTRY}/rancher/hardened-multus-cni:v4.1.2-build20241009 ${REGISTRY}/rancher/hardened-cni-plugins:v1.5.1-build20240910 ${REGISTRY}/rancher/hardened-whereabouts:v0.8.0-build20240910 ${REGISTRY}/rancher/mirrored-library-busybox:1.36.1 From 42131ee4f833cb5d9107b6889e7520625a30de4a Mon Sep 17 00:00:00 2001 From: Michael Fritch Date: Wed, 9 Oct 2024 09:02:57 -0600 Subject: [PATCH 2/2] Update hardened-cni-plugins to `v1.5.1-build20241009` Signed-off-by: Michael Fritch --- charts/chart_versions.yaml | 6 +++--- scripts/build-images | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/charts/chart_versions.yaml b/charts/chart_versions.yaml index 0e8c1e8502..6505af3110 100644 --- a/charts/chart_versions.yaml +++ b/charts/chart_versions.yaml @@ -1,5 +1,5 @@ charts: - - version: 1.16.200 + - version: 1.16.201 filename: /charts/rke2-cilium.yaml bootstrap: true - version: v3.28.2-build2024100300 @@ -26,10 +26,10 @@ charts: - version: 3.12.003 filename: /charts/rke2-metrics-server.yaml bootstrap: false - - version: v4.1.200 + - version: v4.1.201 filename: /charts/rke2-multus.yaml bootstrap: true - - version: v0.25.700 + - version: v0.25.701 filename: /charts/rke2-flannel.yaml bootstrap: true - version: 1.9.100 diff --git a/scripts/build-images b/scripts/build-images index 8a1f37f6bb..7a1684e492 100755 --- a/scripts/build-images +++ b/scripts/build-images @@ -50,7 +50,7 @@ xargs -n1 -t docker image pull --quiet << EOF > build/images-cilium.txt ${REGISTRY}/rancher/mirrored-cilium-operator-aws:v1.16.2 ${REGISTRY}/rancher/mirrored-cilium-operator-azure:v1.16.2 ${REGISTRY}/rancher/mirrored-cilium-operator-generic:v1.16.2 - ${REGISTRY}/rancher/hardened-cni-plugins:v1.5.1-build20240910 + ${REGISTRY}/rancher/hardened-cni-plugins:v1.5.1-build20241009 EOF xargs -n1 -t docker image pull --quiet << EOF > build/images-calico.txt @@ -82,7 +82,7 @@ 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-cni-plugins:v1.5.1-build20240910 + ${REGISTRY}/rancher/hardened-cni-plugins:v1.5.1-build20241009 ${REGISTRY}/rancher/hardened-whereabouts:v0.8.0-build20240910 ${REGISTRY}/rancher/mirrored-library-busybox:1.36.1 EOF @@ -99,7 +99,7 @@ EOF xargs -n1 -t docker image pull --quiet << EOF > build/images-flannel.txt ${REGISTRY}/rancher/hardened-flannel:v0.25.7-build20241007 - ${REGISTRY}/rancher/hardened-cni-plugins:v1.5.1-build20240910 + ${REGISTRY}/rancher/hardened-cni-plugins:v1.5.1-build20241009 EOF fi # Continue to provide a legacy airgap archive set with the default CNI images