Updated Calico and Flannel to fix ARM64 build

Signed-off-by: Roberto Bonafiglia <roberto.bonafiglia@suse.com>
rancher · Apr 23, 2024 · df1d67f · df1d67f
1 parent 1af60b9
commit df1d67f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/charts/chart_versions.yaml b/charts/chart_versions.yaml
@@ -2,9 +2,12 @@ charts:
   - version: 1.15.400
     filename: /charts/rke2-cilium.yaml
     bootstrap: true
-  - version: v3.27.3-build2024040300
+  - version: v3.27.3-build2024042300
     filename: /charts/rke2-canal.yaml
     bootstrap: true
+  - version: v3.27.3-build2024042300
+    filename: /charts/rke2-canal-crd.yaml
+    bootstrap: true
   - version: v3.27.300
     filename: /charts/rke2-calico.yaml
     bootstrap: true
@@ -23,7 +26,7 @@ charts:
   - version: v4.0.2-build2024020802
     filename: /charts/rke2-multus.yaml
     bootstrap: true
-  - version: v0.25.100
+  - version: v0.25.101
     filename: /charts/rke2-flannel.yaml
     bootstrap: true
   - version: 1.7.001

diff --git 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.27.3-build20240403
-    ${REGISTRY}/rancher/hardened-flannel:v0.25.0-build20240410
+    ${REGISTRY}/rancher/hardened-calico:v3.27.3-build20240423
+    ${REGISTRY}/rancher/hardened-flannel:v0.25.1-build20240423
 EOF
 
 if [ "${GOARCH}" != "s390x" ]; then
@@ -101,7 +101,7 @@ 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.1-build20240412
+    ${REGISTRY}/rancher/hardened-flannel:v0.25.1-build20240423
     ${REGISTRY}/rancher/hardened-cni-plugins:v1.4.1-build20240325
 EOF
 fi