Skip to content

Commit

Permalink
Merge pull request #5022 from thomasferrandiz/update-calico-v3.26.3
Browse files Browse the repository at this point in the history
update calico to v3.26.3 and fix nodeAddressAutodetectionV4 issue
  • Loading branch information
thomasferrandiz authored Nov 16, 2023
2 parents e8d2594 + c3411e2 commit d9d53cb
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions charts/chart_versions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ charts:
- version: v3.26.3-build2023110900
filename: /charts/rke2-canal.yaml
bootstrap: true
- version: v3.26.101
- version: v3.26.300
filename: /charts/rke2-calico.yaml
bootstrap: true
- version: v3.26.101
- version: v3.26.300
filename: /charts/rke2-calico-crd.yaml
bootstrap: true
- version: 1.24.007
Expand Down
16 changes: 8 additions & 8 deletions scripts/build-images
Original file line number Diff line number Diff line change
Expand Up @@ -51,14 +51,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.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
${REGISTRY}/rancher/mirrored-calico-operator:v1.30.7
${REGISTRY}/rancher/mirrored-calico-ctl:v3.26.3
${REGISTRY}/rancher/mirrored-calico-kube-controllers:v3.26.3
${REGISTRY}/rancher/mirrored-calico-typha:v3.26.3
${REGISTRY}/rancher/mirrored-calico-node:v3.26.3
${REGISTRY}/rancher/mirrored-calico-pod2daemon-flexvol:v3.26.3
${REGISTRY}/rancher/mirrored-calico-cni:v3.26.3
${REGISTRY}/rancher/mirrored-calico-apiserver:v3.26.3
EOF

xargs -n1 -t docker image pull --quiet << EOF > build/images-vsphere.txt
Expand Down

0 comments on commit d9d53cb

Please sign in to comment.