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

[release-1.32] Bump canal, flannel and multus charts #7712

Merged
merged 3 commits into from
Feb 7, 2025
Merged

[release-1.32] Bump canal, flannel and multus charts #7712

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
932b7d8
Update canal chart
mgfritch Feb 5, 2025
07f6737
Update flannel chart
mgfritch Feb 6, 2025
a27e5ed
Update multus chart
mgfritch Feb 6, 2025
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
6 changes: 3 additions & 3 deletions Dockerfile.windows
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@ ARG KUBERNETES_VERSION=dev
# windows runtime image
ENV CRICTL_VERSION="v1.30.1"
ENV CALICO_VERSION="v3.29.1"
ENV CNI_PLUGIN_VERSION="v1.4.1"
ENV FLANNEL_VERSION="v0.26.3"
ENV CNI_FLANNEL_VERSION="v1.6.0-flannel1"
ENV CNI_PLUGIN_VERSION="v1.6.2"
ENV FLANNEL_VERSION="v0.26.4"
ENV CNI_FLANNEL_VERSION="v1.6.2-flannel1"

RUN mkdir -p rancher

Expand Down
6 changes: 3 additions & 3 deletions charts/chart_versions.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ charts:
- version: 1.16.601
filename: /charts/rke2-cilium.yaml
bootstrap: true
- version: v3.29.1-build2025011000
- version: v3.29.1-build2025020600
filename: /charts/rke2-canal.yaml
bootstrap: true
- version: v3.29.101
Expand All @@ -26,10 +26,10 @@ charts:
- version: 3.12.200
filename: /charts/rke2-metrics-server.yaml
bootstrap: false
- version: v4.1.400
- version: v4.1.403
filename: /charts/rke2-multus.yaml
bootstrap: true
- version: v0.26.300
- version: v0.26.402
filename: /charts/rke2-flannel.yaml
bootstrap: true
- version: 1.10.000
Expand Down
12 changes: 6 additions & 6 deletions scripts/build-images
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ xargs -n1 -t docker image pull --quiet << EOF > build/images-traefik.txt
EOF

xargs -n1 -t docker image pull --quiet << EOF > build/images-canal.txt
${REGISTRY}/rancher/hardened-calico:v3.29.1-build20250110
${REGISTRY}/rancher/hardened-flannel:v0.26.3-build20250108
${REGISTRY}/rancher/hardened-calico:v3.29.1-build20250206
${REGISTRY}/rancher/hardened-flannel:v0.26.4-build20250206
EOF

if [ "${GOARCH}" != "s390x" ]; then
Expand Down Expand Up @@ -81,8 +81,8 @@ fi

xargs -n1 -t docker image pull --quiet << EOF > build/images-multus.txt
${REGISTRY}/rancher/hardened-multus-cni:v4.1.4-build20250108
${REGISTRY}/rancher/hardened-cni-plugins:v1.6.0-build20241022
${REGISTRY}/rancher/hardened-whereabouts:v0.8.0-build20241011
${REGISTRY}/rancher/hardened-cni-plugins:v1.6.2-build20250124
${REGISTRY}/rancher/hardened-whereabouts:v0.8.0-build20250131
${REGISTRY}/rancher/mirrored-library-busybox:1.36.1
EOF

Expand All @@ -97,8 +97,8 @@ 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.26.3-build20250108
${REGISTRY}/rancher/hardened-cni-plugins:v1.6.0-build20241022
${REGISTRY}/rancher/hardened-flannel:v0.26.4-build20250206
${REGISTRY}/rancher/hardened-cni-plugins:v1.6.2-build20250124
EOF
fi
# Continue to provide a legacy airgap archive set with the default CNI images
Expand Down