From 6643092333a5e0c12cbff3bd093607cd5b7dae15 Mon Sep 17 00:00:00 2001 From: Roberto Bonafiglia Date: Mon, 2 Sep 2024 15:53:56 +0200 Subject: [PATCH] Update chart with CNI plugins on Flannel and Cilium Signed-off-by: Roberto Bonafiglia --- Dockerfile.windows | 4 ++-- charts/chart_versions.yaml | 4 ++-- scripts/build-images | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Dockerfile.windows b/Dockerfile.windows index 43aced6e43..e55524b721 100644 --- a/Dockerfile.windows +++ b/Dockerfile.windows @@ -46,8 +46,8 @@ ARG KUBERNETES_VERSION=dev ENV CRICTL_VERSION="v1.30.1" ENV CALICO_VERSION="v3.28.1" ENV CNI_PLUGIN_VERSION="v1.4.1" -ENV FLANNEL_VERSION="v0.25.5" -ENV CNI_FLANNEL_VERSION="v1.4.1-flannel1" +ENV FLANNEL_VERSION="v0.25.6" +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 ad5a7102e0..2d276cfa08 100644 --- a/charts/chart_versions.yaml +++ b/charts/chart_versions.yaml @@ -1,5 +1,5 @@ charts: - - version: 1.16.101 + - version: 1.16.102 filename: /charts/rke2-cilium.yaml bootstrap: true - version: v3.28.1-build2024082701 @@ -29,7 +29,7 @@ charts: - version: v4.0.206 filename: /charts/rke2-multus.yaml bootstrap: true - - version: v0.25.501 + - version: v0.25.600 filename: /charts/rke2-flannel.yaml bootstrap: true - version: 1.9.000 diff --git a/scripts/build-images b/scripts/build-images index a9d2a718e4..c437f732a8 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.1 ${REGISTRY}/rancher/mirrored-cilium-operator-azure:v1.16.1 ${REGISTRY}/rancher/mirrored-cilium-operator-generic:v1.16.1 - ${REGISTRY}/rancher/hardened-cni-plugins:v1.5.1-build20240805 + ${REGISTRY}/rancher/hardened-cni-plugins:v1.5.1-build20240830 EOF xargs -n1 -t docker image pull --quiet << EOF > build/images-calico.txt @@ -106,8 +106,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.5-build20240801 - ${REGISTRY}/rancher/hardened-cni-plugins:v1.5.1-build20240805 + ${REGISTRY}/rancher/hardened-flannel:v0.25.6-build20240828 + ${REGISTRY}/rancher/hardened-cni-plugins:v1.5.1-build20240830 EOF fi # Continue to provide a legacy airgap archive set with the default CNI images