From 561b79e3342513da9fccce04ca74ceeabba13e27 Mon Sep 17 00:00:00 2001 From: Roberto Bonafiglia Date: Fri, 7 Jul 2023 10:34:13 +0200 Subject: [PATCH] Update Calico to v3.26.1 Signed-off-by: Roberto Bonafiglia --- Dockerfile | 4 ++-- Dockerfile.windows | 4 ++-- scripts/build-images | 18 +++++++++--------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7334977b16..c0a0795410 100644 --- a/Dockerfile +++ b/Dockerfile @@ -119,8 +119,8 @@ COPY charts/ /charts/ RUN echo ${CACHEBUST}>/dev/null RUN CHART_VERSION="1.13.200" CHART_FILE=/charts/rke2-cilium.yaml CHART_BOOTSTRAP=true /charts/build-chart.sh RUN CHART_VERSION="v3.25.1-build2023051201" CHART_FILE=/charts/rke2-canal.yaml CHART_BOOTSTRAP=true /charts/build-chart.sh -RUN CHART_VERSION="v3.25.002" CHART_FILE=/charts/rke2-calico.yaml CHART_BOOTSTRAP=true /charts/build-chart.sh -RUN CHART_VERSION="v3.25.002" CHART_FILE=/charts/rke2-calico-crd.yaml CHART_BOOTSTRAP=true /charts/build-chart.sh +RUN CHART_VERSION="v3.26.100" CHART_FILE=/charts/rke2-calico.yaml CHART_BOOTSTRAP=true /charts/build-chart.sh +RUN CHART_VERSION="v3.26.100" CHART_FILE=/charts/rke2-calico-crd.yaml CHART_BOOTSTRAP=true /charts/build-chart.sh RUN CHART_VERSION="1.24.002" CHART_FILE=/charts/rke2-coredns.yaml CHART_BOOTSTRAP=true /charts/build-chart.sh RUN CHART_VERSION="4.5.201" CHART_FILE=/charts/rke2-ingress-nginx.yaml CHART_BOOTSTRAP=false /charts/build-chart.sh RUN CHART_VERSION="2.11.100-build2023051508" CHART_FILE=/charts/rke2-metrics-server.yaml CHART_BOOTSTRAP=false /charts/build-chart.sh diff --git a/Dockerfile.windows b/Dockerfile.windows index d18e94a6cf..dc8729b9fd 100644 --- a/Dockerfile.windows +++ b/Dockerfile.windows @@ -43,8 +43,8 @@ FROM build as windows-runtime-collect ARG KUBERNETES_VERSION=dev # windows runtime image -ENV CRICTL_VERSION="v1.25.0" -ENV CALICO_VERSION="v3.25.0" +ENV CRICTL_VERSION="v1.26.0" +ENV CALICO_VERSION="v3.26.1" ENV CNI_PLUGIN_VERSION="v1.1.1" RUN mkdir -p rancher diff --git a/scripts/build-images b/scripts/build-images index da502d7068..e240632728 100755 --- a/scripts/build-images +++ b/scripts/build-images @@ -45,18 +45,18 @@ xargs -n1 -t docker image pull --quiet << EOF > build/images-cilium.txt ${REGISTRY}/rancher/mirrored-cilium-operator-aws:v1.13.2 ${REGISTRY}/rancher/mirrored-cilium-operator-azure:v1.13.2 ${REGISTRY}/rancher/mirrored-cilium-operator-generic:v1.13.2 - ${REGISTRY}/rancher/hardened-cni-plugins:v1.0.1-build20221011 + ${REGISTRY}/rancher/hardened-cni-plugins:v1.2.0-build20230523 EOF xargs -n1 -t docker image pull --quiet << EOF > build/images-calico.txt - ${REGISTRY}/rancher/mirrored-calico-operator:v1.29.0 - ${REGISTRY}/rancher/mirrored-calico-ctl:v3.25.0 - ${REGISTRY}/rancher/mirrored-calico-kube-controllers:v3.25.0 - ${REGISTRY}/rancher/mirrored-calico-typha:v3.25.0 - ${REGISTRY}/rancher/mirrored-calico-node:v3.25.0 - ${REGISTRY}/rancher/mirrored-calico-pod2daemon-flexvol:v3.25.0 - ${REGISTRY}/rancher/mirrored-calico-cni:v3.25.0 - ${REGISTRY}/rancher/mirrored-calico-apiserver:v3.25.0 + ${REGISTRY}/rancher/mirrored-calico-operator:v1.30.4 + ${REGISTRY}/rancher/mirrored-calico-ctl:v3.26.1 + ${REGISTRY}/rancher/mirrored-calico-kube-controllers:v3.26.1 + ${REGISTRY}/rancher/mirrored-calico-typha:v3.26.1 + ${REGISTRY}/rancher/mirrored-calico-node:v3.26.1 + ${REGISTRY}/rancher/mirrored-calico-pod2daemon-flexvol:v3.26.1 + ${REGISTRY}/rancher/mirrored-calico-cni:v3.26.1 + ${REGISTRY}/rancher/mirrored-calico-apiserver:v3.26.1 EOF xargs -n1 -t docker image pull --quiet << EOF > build/images-vsphere.txt