Update Calico to v3.26.1

Signed-off-by: Roberto Bonafiglia <[email protected]>
rancher · Jul 7, 2023 · e9880f9 · e9880f9
1 parent 292f256
commit e9880f9
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -107,8 +107,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-build2023051202"   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.004"                  CHART_FILE=/charts/rke2-coredns.yaml        CHART_BOOTSTRAP=true   /charts/build-chart.sh
 RUN CHART_VERSION="4.6.100"                   CHART_FILE=/charts/rke2-ingress-nginx.yaml  CHART_BOOTSTRAP=false  /charts/build-chart.sh
 RUN CHART_VERSION="2.11.100-build2023051509"  CHART_FILE=/charts/rke2-metrics-server.yaml CHART_BOOTSTRAP=false  /charts/build-chart.sh

diff --git 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.27.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
@@ -49,14 +49,14 @@ xargs -n1 -t docker image pull --quiet << EOF > build/images-cilium.txt
 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