From 60989fee4ed0ac96b0d6efaa9b8724285f7f72e2 Mon Sep 17 00:00:00 2001 From: Thomas Ferrandiz Date: Wed, 7 Aug 2024 09:03:10 +0000 Subject: [PATCH 1/3] Bump rke2-canal to v3.28.1-build2024080600 --- 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 743528a204..51f8e7873e 100644 --- a/charts/chart_versions.yaml +++ b/charts/chart_versions.yaml @@ -2,7 +2,7 @@ charts: - version: 1.15.500 filename: /charts/rke2-cilium.yaml bootstrap: true - - version: v3.28.0-build2024062503 + - version: v3.28.1-build2024080600 filename: /charts/rke2-canal.yaml bootstrap: true - version: v3.28.100 diff --git a/scripts/build-images b/scripts/build-images index 13b4b2074f..d904d56b10 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.0-build20240625 - ${REGISTRY}/rancher/hardened-flannel:v0.25.4-build20240610 + ${REGISTRY}/rancher/hardened-calico:v3.28.1-build20240806 + ${REGISTRY}/rancher/hardened-flannel:v0.25.5-build20240801 EOF if [ "${GOARCH}" != "s390x" ]; then From 367667f57aeb20c9d4d33f4de61a1615d20f9618 Mon Sep 17 00:00:00 2001 From: Roberto Bonafiglia Date: Wed, 7 Aug 2024 15:18:23 +0200 Subject: [PATCH 2/3] 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 df146fcc05..7e42915295 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.28.1" 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 51f8e7873e..ec9b513332 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 d904d56b10..d3cce1acd7 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 From d62b2e2080eb87d2b9810b909844d19aedcf9036 Mon Sep 17 00:00:00 2001 From: Roberto Bonafiglia Date: Wed, 7 Aug 2024 15:39:39 +0200 Subject: [PATCH 3/3] Update Cilium to v1.16.0 Signed-off-by: Roberto Bonafiglia --- charts/chart_versions.yaml | 2 +- scripts/build-images | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/charts/chart_versions.yaml b/charts/chart_versions.yaml index ec9b513332..63975b4f25 100644 --- a/charts/chart_versions.yaml +++ b/charts/chart_versions.yaml @@ -1,5 +1,5 @@ charts: - - version: 1.15.500 + - version: 1.16.000 filename: /charts/rke2-cilium.yaml bootstrap: true - version: v3.28.1-build2024080600 diff --git a/scripts/build-images b/scripts/build-images index d3cce1acd7..b93b877a19 100755 --- a/scripts/build-images +++ b/scripts/build-images @@ -36,16 +36,16 @@ EOF if [ "${GOARCH}" != "s390x" ]; then xargs -n1 -t docker image pull --quiet << EOF > build/images-cilium.txt - ${REGISTRY}/rancher/mirrored-cilium-certgen:v0.1.12 - ${REGISTRY}/rancher/mirrored-cilium-cilium:v1.15.5 - ${REGISTRY}/rancher/mirrored-cilium-cilium-envoy:v1.28.3-31ec52ec5f2e4d28a8e19a0bfb872fa48cf7a515 - ${REGISTRY}/rancher/mirrored-cilium-clustermesh-apiserver:v1.15.5 - ${REGISTRY}/rancher/mirrored-cilium-hubble-relay:v1.15.5 - ${REGISTRY}/rancher/mirrored-cilium-hubble-ui:v0.13.0 - ${REGISTRY}/rancher/mirrored-cilium-hubble-ui-backend:v0.13.0 - ${REGISTRY}/rancher/mirrored-cilium-operator-aws:v1.15.5 - ${REGISTRY}/rancher/mirrored-cilium-operator-azure:v1.15.5 - ${REGISTRY}/rancher/mirrored-cilium-operator-generic:v1.15.5 + ${REGISTRY}/rancher/mirrored-cilium-certgen:v0.2.0 + ${REGISTRY}/rancher/mirrored-cilium-cilium:v1.16.0 + ${REGISTRY}/rancher/mirrored-cilium-cilium-envoy:v1.29.7-39a2a56bbd5b3a591f69dbca51d3e30ef97e0e51 + ${REGISTRY}/rancher/mirrored-cilium-clustermesh-apiserver:v1.16.0 + ${REGISTRY}/rancher/mirrored-cilium-hubble-relay:v1.16.0 + ${REGISTRY}/rancher/mirrored-cilium-hubble-ui:v0.13.1 + ${REGISTRY}/rancher/mirrored-cilium-hubble-ui-backend:v0.13.1 + ${REGISTRY}/rancher/mirrored-cilium-operator-aws:v1.16.0 + ${REGISTRY}/rancher/mirrored-cilium-operator-azure:v1.16.0 + ${REGISTRY}/rancher/mirrored-cilium-operator-generic:v1.16.0 ${REGISTRY}/rancher/hardened-cni-plugins:v1.4.1-build20240325 EOF