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] Update chart with CNI plugins on Flannel and Cilium #6700

Merged
merged 1 commit into from
Sep 5, 2024
+7 −7
Merged

[Release 1.31] Update chart with CNI plugins on Flannel and Cilium #6700

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
4 changes: 2 additions & 2 deletions Dockerfile.windows
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ ARG KUBERNETES_VERSION=dev
ENV CRICTL_VERSION="v1.30.1"
ENV CALICO_VERSION="v3.28.1"
ENV CNI_PLUGIN_VERSION="v1.4.1"
ENV FLANNEL_VERSION="v0.25.5"
ENV CNI_FLANNEL_VERSION="v1.4.1-flannel1"
ENV FLANNEL_VERSION="v0.25.6"
ENV CNI_FLANNEL_VERSION="v1.5.1-flannel2"

RUN mkdir -p rancher

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
@@ -1,5 +1,5 @@
charts:
- version: 1.16.101
- version: 1.16.102
filename: /charts/rke2-cilium.yaml
bootstrap: true
- version: v3.28.1-build2024082701
Expand Down Expand Up @@ -29,7 +29,7 @@ charts:
- version: v4.0.206
filename: /charts/rke2-multus.yaml
bootstrap: true
- version: v0.25.501
- version: v0.25.600
filename: /charts/rke2-flannel.yaml
bootstrap: true
- version: 1.9.000
Expand Down
6 changes: 3 additions & 3 deletions scripts/build-images
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ xargs -n1 -t docker image pull --quiet << EOF > build/images-cilium.txt
${REGISTRY}/rancher/mirrored-cilium-operator-aws:v1.16.1
${REGISTRY}/rancher/mirrored-cilium-operator-azure:v1.16.1
${REGISTRY}/rancher/mirrored-cilium-operator-generic:v1.16.1
${REGISTRY}/rancher/hardened-cni-plugins:v1.5.1-build20240805
${REGISTRY}/rancher/hardened-cni-plugins:v1.5.1-build20240830
EOF

xargs -n1 -t docker image pull --quiet << EOF > build/images-calico.txt
Expand Down Expand Up @@ -106,8 +106,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.5-build20240801
${REGISTRY}/rancher/hardened-cni-plugins:v1.5.1-build20240805
${REGISTRY}/rancher/hardened-flannel:v0.25.6-build20240828
${REGISTRY}/rancher/hardened-cni-plugins:v1.5.1-build20240830
EOF
fi
# Continue to provide a legacy airgap archive set with the default CNI images
Expand Down