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.28] Update for CNI flannel, Cilium and Canal #6517

Merged
merged 3 commits into from
Aug 8, 2024
Merged

[Release 1.28] Update for CNI flannel, Cilium and Canal #6517

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
60989fe
Bump rke2-canal to v3.28.1-build2024080600
thomasferrandiz Aug 7, 2024
367667f
Update flannel to v0.25.5
rbrtbnfgl Aug 7, 2024
d62b2e2
Update Cilium to v1.16.0
rbrtbnfgl Aug 7, 2024
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 @@ -46,7 +46,7 @@ ARG KUBERNETES_VERSION=dev
ENV CRICTL_VERSION="v1.27.0"
ENV CALICO_VERSION="v3.28.1"
ENV CNI_PLUGIN_VERSION="v1.4.1"
ENV FLANNEL_VERSION="v0.25.4"
ENV FLANNEL_VERSION="v0.25.5"
ENV CNI_FLANNEL_VERSION="v1.4.1-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
@@ -1,8 +1,8 @@
charts:
- version: 1.15.500
- version: 1.16.000
filename: /charts/rke2-cilium.yaml
bootstrap: true
- version: v3.28.0-build2024062503
- version: v3.28.1-build2024080600
filename: /charts/rke2-canal.yaml
bootstrap: true
- version: v3.28.100
Expand All @@ -23,7 +23,7 @@ charts:
- version: v4.0.206
filename: /charts/rke2-multus.yaml
bootstrap: true
- version: v0.25.400
- version: v0.25.500
filename: /charts/rke2-flannel.yaml
bootstrap: true
- version: 1.8.000
Expand Down
28 changes: 14 additions & 14 deletions scripts/build-images
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,22 +30,22 @@ 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.28.0-build20240625
${REGISTRY}/rancher/hardened-flannel:v0.25.4-build20240610
${REGISTRY}/rancher/hardened-calico:v3.28.1-build20240806
${REGISTRY}/rancher/hardened-flannel:v0.25.5-build20240801
EOF

if [ "${GOARCH}" != "s390x" ]; then
xargs -n1 -t docker image pull --quiet << EOF > build/images-cilium.txt
${REGISTRY}/rancher/mirrored-cilium-certgen:v0.1.12
${REGISTRY}/rancher/mirrored-cilium-cilium:v1.15.5
${REGISTRY}/rancher/mirrored-cilium-cilium-envoy:v1.28.3-31ec52ec5f2e4d28a8e19a0bfb872fa48cf7a515
${REGISTRY}/rancher/mirrored-cilium-clustermesh-apiserver:v1.15.5
${REGISTRY}/rancher/mirrored-cilium-hubble-relay:v1.15.5
${REGISTRY}/rancher/mirrored-cilium-hubble-ui:v0.13.0
${REGISTRY}/rancher/mirrored-cilium-hubble-ui-backend:v0.13.0
${REGISTRY}/rancher/mirrored-cilium-operator-aws:v1.15.5
${REGISTRY}/rancher/mirrored-cilium-operator-azure:v1.15.5
${REGISTRY}/rancher/mirrored-cilium-operator-generic:v1.15.5
${REGISTRY}/rancher/mirrored-cilium-certgen:v0.2.0
${REGISTRY}/rancher/mirrored-cilium-cilium:v1.16.0
${REGISTRY}/rancher/mirrored-cilium-cilium-envoy:v1.29.7-39a2a56bbd5b3a591f69dbca51d3e30ef97e0e51
${REGISTRY}/rancher/mirrored-cilium-clustermesh-apiserver:v1.16.0
${REGISTRY}/rancher/mirrored-cilium-hubble-relay:v1.16.0
${REGISTRY}/rancher/mirrored-cilium-hubble-ui:v0.13.1
${REGISTRY}/rancher/mirrored-cilium-hubble-ui-backend:v0.13.1
${REGISTRY}/rancher/mirrored-cilium-operator-aws:v1.16.0
${REGISTRY}/rancher/mirrored-cilium-operator-azure:v1.16.0
${REGISTRY}/rancher/mirrored-cilium-operator-generic:v1.16.0
${REGISTRY}/rancher/hardened-cni-plugins:v1.4.1-build20240325
EOF

Expand Down Expand Up @@ -102,8 +102,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.25.4-build20240610
${REGISTRY}/rancher/hardened-cni-plugins:v1.4.1-build20240430
${REGISTRY}/rancher/hardened-flannel:v0.25.5-build20240801
${REGISTRY}/rancher/hardened-cni-plugins:v1.5.1-build20240805
EOF
fi
# Continue to provide a legacy airgap archive set with the default CNI images
Expand Down