From 932b7d8a83e67cb254377896e7ff81ecee4882bb Mon Sep 17 00:00:00 2001 From: Michael Fritch Date: Wed, 5 Feb 2025 16:58:30 -0700 Subject: [PATCH 1/3] Update canal chart Chart bump for the following images: - hardened-calico:v3.29.1-build20250206 - hardened-flannel:v0.26.4-build20250206 Signed-off-by: Michael Fritch (cherry picked from commit 8c3baae68db30222cf7afda9de45df19a9bf3acf) --- charts/chart_versions.yaml | 2 +- scripts/build-images | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/chart_versions.yaml b/charts/chart_versions.yaml index 6f17cb54b5..5916c734ca 100644 --- a/charts/chart_versions.yaml +++ b/charts/chart_versions.yaml @@ -2,7 +2,7 @@ charts: - version: 1.16.601 filename: /charts/rke2-cilium.yaml bootstrap: true - - version: v3.29.1-build2025011000 + - version: v3.29.1-build2025020600 filename: /charts/rke2-canal.yaml bootstrap: true - version: v3.29.101 diff --git a/scripts/build-images b/scripts/build-images index 88a9347870..18419eb68e 100755 --- a/scripts/build-images +++ b/scripts/build-images @@ -33,8 +33,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.29.1-build20250110 - ${REGISTRY}/rancher/hardened-flannel:v0.26.3-build20250108 + ${REGISTRY}/rancher/hardened-calico:v3.29.1-build20250206 + ${REGISTRY}/rancher/hardened-flannel:v0.26.4-build20250206 EOF if [ "${GOARCH}" != "s390x" ]; then From 07f6737f218334dd19f070908cc19e3fc3c03078 Mon Sep 17 00:00:00 2001 From: Michael Fritch Date: Wed, 5 Feb 2025 17:18:11 -0700 Subject: [PATCH 2/3] Update flannel chart Chart bump for the following images: - hardened-flannel:v0.26.4-build20250206 - hardened-cni-plugins:v1.6.2-build20250124 Signed-off-by: Michael Fritch (cherry picked from commit d521b204cee1f65fc5effbf3362bb1d48426fcf6) --- Dockerfile.windows | 6 +++--- charts/chart_versions.yaml | 2 +- scripts/build-images | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile.windows b/Dockerfile.windows index 93fb23d85c..3db4e5f183 100644 --- a/Dockerfile.windows +++ b/Dockerfile.windows @@ -45,9 +45,9 @@ ARG KUBERNETES_VERSION=dev # windows runtime image ENV CRICTL_VERSION="v1.30.1" ENV CALICO_VERSION="v3.29.1" -ENV CNI_PLUGIN_VERSION="v1.4.1" -ENV FLANNEL_VERSION="v0.26.3" -ENV CNI_FLANNEL_VERSION="v1.6.0-flannel1" +ENV CNI_PLUGIN_VERSION="v1.6.2" +ENV FLANNEL_VERSION="v0.26.4" +ENV CNI_FLANNEL_VERSION="v1.6.2-flannel1" RUN mkdir -p rancher diff --git a/charts/chart_versions.yaml b/charts/chart_versions.yaml index 5916c734ca..22c26a8040 100644 --- a/charts/chart_versions.yaml +++ b/charts/chart_versions.yaml @@ -29,7 +29,7 @@ charts: - version: v4.1.400 filename: /charts/rke2-multus.yaml bootstrap: true - - version: v0.26.300 + - version: v0.26.402 filename: /charts/rke2-flannel.yaml bootstrap: true - version: 1.10.000 diff --git a/scripts/build-images b/scripts/build-images index 18419eb68e..c877e05a73 100755 --- a/scripts/build-images +++ b/scripts/build-images @@ -97,8 +97,8 @@ xargs -n1 -t docker image pull --quiet << EOF > build/images-harvester.txt EOF xargs -n1 -t docker image pull --quiet << EOF > build/images-flannel.txt - ${REGISTRY}/rancher/hardened-flannel:v0.26.3-build20250108 - ${REGISTRY}/rancher/hardened-cni-plugins:v1.6.0-build20241022 + ${REGISTRY}/rancher/hardened-flannel:v0.26.4-build20250206 + ${REGISTRY}/rancher/hardened-cni-plugins:v1.6.2-build20250124 EOF fi # Continue to provide a legacy airgap archive set with the default CNI images From a27e5ed880c4578116cda365f3de74477a5e16f4 Mon Sep 17 00:00:00 2001 From: Michael Fritch Date: Wed, 5 Feb 2025 17:18:16 -0700 Subject: [PATCH 3/3] Update multus chart Chart bump for the following images: - hardened-cni-plugins:v1.6.2-build20250124 - hardened-whereabouts:v0.8.0-build20250131 Signed-off-by: Michael Fritch (cherry picked from commit 12fb98349eb2dc69173fb5e0f98d31e7a63b5d50) --- charts/chart_versions.yaml | 2 +- scripts/build-images | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/chart_versions.yaml b/charts/chart_versions.yaml index 22c26a8040..1bbfa69ed4 100644 --- a/charts/chart_versions.yaml +++ b/charts/chart_versions.yaml @@ -26,7 +26,7 @@ charts: - version: 3.12.200 filename: /charts/rke2-metrics-server.yaml bootstrap: false - - version: v4.1.400 + - version: v4.1.403 filename: /charts/rke2-multus.yaml bootstrap: true - version: v0.26.402 diff --git a/scripts/build-images b/scripts/build-images index c877e05a73..07cc11ed94 100755 --- a/scripts/build-images +++ b/scripts/build-images @@ -81,8 +81,8 @@ fi xargs -n1 -t docker image pull --quiet << EOF > build/images-multus.txt ${REGISTRY}/rancher/hardened-multus-cni:v4.1.4-build20250108 - ${REGISTRY}/rancher/hardened-cni-plugins:v1.6.0-build20241022 - ${REGISTRY}/rancher/hardened-whereabouts:v0.8.0-build20241011 + ${REGISTRY}/rancher/hardened-cni-plugins:v1.6.2-build20250124 + ${REGISTRY}/rancher/hardened-whereabouts:v0.8.0-build20250131 ${REGISTRY}/rancher/mirrored-library-busybox:1.36.1 EOF