Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[release 1.31] Bump rke2-calico to v3.29.0 #7229

Merged
merged 1 commit into from
Nov 7, 2024
Merged

[release 1.31] Bump rke2-calico to v3.29.0 #7229

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile.windows
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ ARG KUBERNETES_VERSION=dev

# windows runtime image
ENV CRICTL_VERSION="v1.30.1"
ENV CALICO_VERSION="v3.28.2"
ENV CALICO_VERSION="v3.29.0"
ENV CNI_PLUGIN_VERSION="v1.4.1"
ENV FLANNEL_VERSION="v0.26.0"
ENV CNI_FLANNEL_VERSION="v1.6.0-flannel1"
Expand Down
4 changes: 2 additions & 2 deletions charts/chart_versions.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ charts:
- version: v3.28.2-build2024101601
filename: /charts/rke2-canal.yaml
bootstrap: true
- version: v3.28.200
- version: v3.29.000
filename: /charts/rke2-calico.yaml
bootstrap: true
- version: v3.28.200
- version: v3.29.000
filename: /charts/rke2-calico-crd.yaml
bootstrap: true
- version: 1.33.002
Expand Down
20 changes: 10 additions & 10 deletions scripts/build-images
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,16 +54,16 @@ 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.34.5
${REGISTRY}/rancher/mirrored-calico-ctl:v3.28.2
${REGISTRY}/rancher/mirrored-calico-kube-controllers:v3.28.2
${REGISTRY}/rancher/mirrored-calico-typha:v3.28.2
${REGISTRY}/rancher/mirrored-calico-node:v3.28.2
${REGISTRY}/rancher/mirrored-calico-pod2daemon-flexvol:v3.28.2
${REGISTRY}/rancher/mirrored-calico-cni:v3.28.2
${REGISTRY}/rancher/mirrored-calico-apiserver:v3.28.2
${REGISTRY}/rancher/mirrored-calico-csi:v3.28.2
${REGISTRY}/rancher/mirrored-calico-node-driver-registrar:v3.28.2
${REGISTRY}/rancher/mirrored-calico-operator:v1.36.0
${REGISTRY}/rancher/mirrored-calico-ctl:v3.29.0
${REGISTRY}/rancher/mirrored-calico-kube-controllers:v3.29.0
${REGISTRY}/rancher/mirrored-calico-typha:v3.29.0
${REGISTRY}/rancher/mirrored-calico-node:v3.29.0
${REGISTRY}/rancher/mirrored-calico-pod2daemon-flexvol:v3.29.0
${REGISTRY}/rancher/mirrored-calico-cni:v3.29.0
${REGISTRY}/rancher/mirrored-calico-apiserver:v3.29.0
${REGISTRY}/rancher/mirrored-calico-csi:v3.29.0
${REGISTRY}/rancher/mirrored-calico-node-driver-registrar:v3.29.0
EOF

if [ "${GOARCH}" != "arm64" ]; then
Expand Down