Merge pull request rancher#3620 from thomasferrandiz/update-calico-v3…

….24.5 update rke2-calico chart to v3.24.501
mgfritch · Dec 2, 2022 · bc78cb2 · bc78cb2
2 parents 4ad8a14 + 6043c6b
commit bc78cb2
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -119,8 +119,8 @@ COPY charts/ /charts/
 RUN echo ${CACHEBUST}>/dev/null
 RUN CHART_VERSION="1.12.302"                  CHART_FILE=/charts/rke2-cilium.yaml         CHART_BOOTSTRAP=true   /charts/build-chart.sh
 RUN CHART_VERSION="v3.24.5-build2022120101"   CHART_FILE=/charts/rke2-canal.yaml          CHART_BOOTSTRAP=true   /charts/build-chart.sh
-RUN CHART_VERSION="v3.24.102"                 CHART_FILE=/charts/rke2-calico.yaml         CHART_BOOTSTRAP=true   /charts/build-chart.sh
-RUN CHART_VERSION="v3.24.102"                 CHART_FILE=/charts/rke2-calico-crd.yaml     CHART_BOOTSTRAP=true   /charts/build-chart.sh
+RUN CHART_VERSION="v3.24.501"                 CHART_FILE=/charts/rke2-calico.yaml         CHART_BOOTSTRAP=true   /charts/build-chart.sh
+RUN CHART_VERSION="v3.24.501"                 CHART_FILE=/charts/rke2-calico-crd.yaml     CHART_BOOTSTRAP=true   /charts/build-chart.sh
 RUN CHART_VERSION="1.19.401"                  CHART_FILE=/charts/rke2-coredns.yaml        CHART_BOOTSTRAP=true   /charts/build-chart.sh
 RUN CHART_VERSION="4.1.005"                   CHART_FILE=/charts/rke2-ingress-nginx.yaml  CHART_BOOTSTRAP=false  /charts/build-chart.sh
 RUN CHART_VERSION="2.11.100-build2022101106"  CHART_FILE=/charts/rke2-metrics-server.yaml CHART_BOOTSTRAP=false  /charts/build-chart.sh

diff --git a/Dockerfile.windows b/Dockerfile.windows
@@ -44,7 +44,7 @@ ARG KUBERNETES_VERSION=dev
 # windows runtime image
 ENV CRICTL_VERSION="v1.25.0"
 ENV CONTAINERD_VERSION="1.6.10"
-ENV CALICO_VERSION="v3.24.1"
+ENV CALICO_VERSION="v3.24.5"
 ENV CNI_PLUGIN_VERSION="v1.1.1"
 
 RUN mkdir -p rancher

diff --git a/scripts/build-images b/scripts/build-images
@@ -41,14 +41,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.28.1
-    ${REGISTRY}/rancher/mirrored-calico-ctl:v3.24.1
-    ${REGISTRY}/rancher/mirrored-calico-kube-controllers:v3.24.1
-    ${REGISTRY}/rancher/mirrored-calico-typha:v3.24.1
-    ${REGISTRY}/rancher/mirrored-calico-node:v3.24.1
-    ${REGISTRY}/rancher/mirrored-calico-pod2daemon-flexvol:v3.24.1
-    ${REGISTRY}/rancher/mirrored-calico-cni:v3.24.1
-    ${REGISTRY}/rancher/mirrored-calico-apiserver:v3.24.1
+    ${REGISTRY}/rancher/mirrored-calico-operator:v1.28.5
+    ${REGISTRY}/rancher/mirrored-calico-ctl:v3.24.5
+    ${REGISTRY}/rancher/mirrored-calico-kube-controllers:v3.24.5
+    ${REGISTRY}/rancher/mirrored-calico-typha:v3.24.5
+    ${REGISTRY}/rancher/mirrored-calico-node:v3.24.5
+    ${REGISTRY}/rancher/mirrored-calico-pod2daemon-flexvol:v3.24.5
+    ${REGISTRY}/rancher/mirrored-calico-cni:v3.24.5
+    ${REGISTRY}/rancher/mirrored-calico-apiserver:v3.24.5
 EOF
 
 xargs -n1 -t docker image pull --quiet << EOF > build/images-vsphere.txt