From 7fba03ba8fa4b0a891a1bef948b80402bf4b983f Mon Sep 17 00:00:00 2001 From: Roberto Bonafiglia Date: Tue, 8 Oct 2024 15:26:49 +0200 Subject: [PATCH 1/2] Update Canal version to v3.28.2-build2024100300 Signed-off-by: Roberto Bonafiglia --- 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 c713b69237..fce6942ac8 100644 --- a/charts/chart_versions.yaml +++ b/charts/chart_versions.yaml @@ -2,7 +2,7 @@ charts: - version: 1.16.200 filename: /charts/rke2-cilium.yaml bootstrap: true - - version: v3.28.1-build2024091100 + - version: v3.28.2-build2024100300 filename: /charts/rke2-canal.yaml bootstrap: true - version: v3.28.200 diff --git a/scripts/build-images b/scripts/build-images index ade3581b16..f5090f308b 100755 --- a/scripts/build-images +++ b/scripts/build-images @@ -30,8 +30,8 @@ xargs -n1 -t docker image pull --quiet << EOF >> build/images-core.txt EOF xargs -n1 -t docker image pull --quiet << EOF > build/images-canal.txt - ${REGISTRY}/rancher/hardened-calico:v3.28.1-build20240911 - ${REGISTRY}/rancher/hardened-flannel:v0.25.6-build20240910 + ${REGISTRY}/rancher/hardened-calico:v3.28.2-build20241003 + ${REGISTRY}/rancher/hardened-flannel:v0.25.7-build20241007 EOF if [ "${GOARCH}" != "s390x" ]; then From 78846c3a5404bd3d91f07df4e49622857b8e8628 Mon Sep 17 00:00:00 2001 From: Roberto Bonafiglia Date: Tue, 8 Oct 2024 15:29:36 +0200 Subject: [PATCH 2/2] Update Flannel version to v0.25.7 Signed-off-by: Roberto Bonafiglia --- Dockerfile.windows | 2 +- charts/chart_versions.yaml | 2 +- scripts/build-images | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile.windows b/Dockerfile.windows index dcb89eab48..f5f852879c 100644 --- a/Dockerfile.windows +++ b/Dockerfile.windows @@ -46,7 +46,7 @@ ARG KUBERNETES_VERSION=dev ENV CRICTL_VERSION="v1.29.0" ENV CALICO_VERSION="v3.28.2" ENV CNI_PLUGIN_VERSION="v1.4.1" -ENV FLANNEL_VERSION="v0.25.6" +ENV FLANNEL_VERSION="v0.25.7" ENV CNI_FLANNEL_VERSION="v1.5.1-flannel2" RUN mkdir -p rancher diff --git a/charts/chart_versions.yaml b/charts/chart_versions.yaml index fce6942ac8..652e606621 100644 --- a/charts/chart_versions.yaml +++ b/charts/chart_versions.yaml @@ -23,7 +23,7 @@ charts: - version: v4.1.001 filename: /charts/rke2-multus.yaml bootstrap: true - - version: v0.25.601 + - version: v0.25.700 filename: /charts/rke2-flannel.yaml bootstrap: true - version: 1.8.000 diff --git a/scripts/build-images b/scripts/build-images index f5090f308b..f954e44f80 100755 --- a/scripts/build-images +++ b/scripts/build-images @@ -94,7 +94,7 @@ 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.25.6-build20240910 + ${REGISTRY}/rancher/hardened-flannel:v0.25.7-build20241007 ${REGISTRY}/rancher/hardened-cni-plugins:v1.5.1-build20240910 EOF fi