From f736a874a7b63b8aec4c776770f3d3390f4ada94 Mon Sep 17 00:00:00 2001 From: Roberto Bonafiglia Date: Wed, 7 Aug 2024 15:18:23 +0200 Subject: [PATCH] Update flannel to v0.25.5 Signed-off-by: Roberto Bonafiglia --- Dockerfile.windows | 2 +- charts/chart_versions.yaml | 2 +- scripts/build-images | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile.windows b/Dockerfile.windows index 4406fb058f..c29524fc65 100644 --- a/Dockerfile.windows +++ b/Dockerfile.windows @@ -46,7 +46,7 @@ ARG KUBERNETES_VERSION=dev ENV CRICTL_VERSION="v1.27.0" ENV CALICO_VERSION="v3.27.3" ENV CNI_PLUGIN_VERSION="v1.4.1" -ENV FLANNEL_VERSION="v0.25.4" +ENV FLANNEL_VERSION="v0.25.5" ENV CNI_FLANNEL_VERSION="v1.4.1-flannel1" RUN mkdir -p rancher diff --git a/charts/chart_versions.yaml b/charts/chart_versions.yaml index 597e5924c6..18ffc5940c 100644 --- a/charts/chart_versions.yaml +++ b/charts/chart_versions.yaml @@ -23,7 +23,7 @@ charts: - version: v4.0.206 filename: /charts/rke2-multus.yaml bootstrap: true - - version: v0.25.400 + - version: v0.25.500 filename: /charts/rke2-flannel.yaml bootstrap: true - version: 1.8.000 diff --git a/scripts/build-images b/scripts/build-images index 0222ed27f3..e58afd42cf 100755 --- a/scripts/build-images +++ b/scripts/build-images @@ -102,8 +102,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.25.4-build20240610 - ${REGISTRY}/rancher/hardened-cni-plugins:v1.4.1-build20240430 + ${REGISTRY}/rancher/hardened-flannel:v0.25.5-build20240801 + ${REGISTRY}/rancher/hardened-cni-plugins:v1.5.1-build20240805 EOF fi # Continue to provide a legacy airgap archive set with the default CNI images