Skip to content

Commit

Permalink
Bump multus, cilium and flannel charts
Browse files Browse the repository at this point in the history
Signed-off-by: manuelbuil <[email protected]>
  • Loading branch information
manuelbuil committed Nov 6, 2024
1 parent 0182fbc commit 2639138
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 17 deletions.
4 changes: 2 additions & 2 deletions Dockerfile.windows
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ ARG KUBERNETES_VERSION=dev
ENV CRICTL_VERSION="v1.29.0"
ENV CALICO_VERSION="v3.28.2"
ENV CNI_PLUGIN_VERSION="v1.4.1"
ENV FLANNEL_VERSION="v0.25.7"
ENV CNI_FLANNEL_VERSION="v1.5.1-flannel2"
ENV FLANNEL_VERSION="v0.26.0"
ENV CNI_FLANNEL_VERSION="v1.6.0-flannel1"

RUN mkdir -p rancher

Expand Down
6 changes: 3 additions & 3 deletions charts/chart_versions.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
charts:
- version: 1.16.201
- version: 1.16.303
filename: /charts/rke2-cilium.yaml
bootstrap: true
- version: v3.28.2-build2024101601
Expand All @@ -20,10 +20,10 @@ charts:
- version: 3.12.004
filename: /charts/rke2-metrics-server.yaml
bootstrap: false
- version: v4.1.205
- version: v4.1.301
filename: /charts/rke2-multus.yaml
bootstrap: true
- version: v0.25.704
- version: v0.26.001
filename: /charts/rke2-flannel.yaml
bootstrap: true
- version: 1.8.000
Expand Down
24 changes: 12 additions & 12 deletions scripts/build-images
Original file line number Diff line number Diff line change
Expand Up @@ -37,16 +37,16 @@ EOF
if [ "${GOARCH}" != "s390x" ]; then
xargs -n1 -t docker image pull --quiet << EOF > build/images-cilium.txt
${REGISTRY}/rancher/mirrored-cilium-certgen:v0.2.0
${REGISTRY}/rancher/mirrored-cilium-cilium:v1.16.2
${REGISTRY}/rancher/mirrored-cilium-cilium-envoy:v1.29.9-1726784081-a90146d13b4cd7d168d573396ccf2b3db5a3b047
${REGISTRY}/rancher/mirrored-cilium-clustermesh-apiserver:v1.16.2
${REGISTRY}/rancher/mirrored-cilium-hubble-relay:v1.16.2
${REGISTRY}/rancher/mirrored-cilium-cilium:v1.16.3
${REGISTRY}/rancher/mirrored-cilium-cilium-envoy:v1.29.9-1728346947-0d05e48bfbb8c4737ec40d5781d970a550ed2bbd
${REGISTRY}/rancher/mirrored-cilium-clustermesh-apiserver:v1.16.3
${REGISTRY}/rancher/mirrored-cilium-hubble-relay:v1.16.3
${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.2
${REGISTRY}/rancher/mirrored-cilium-operator-azure:v1.16.2
${REGISTRY}/rancher/mirrored-cilium-operator-generic:v1.16.2
${REGISTRY}/rancher/hardened-cni-plugins:v1.5.1-build20241009
${REGISTRY}/rancher/mirrored-cilium-operator-aws:v1.16.3
${REGISTRY}/rancher/mirrored-cilium-operator-azure:v1.16.3
${REGISTRY}/rancher/mirrored-cilium-operator-generic:v1.16.3
${REGISTRY}/rancher/hardened-cni-plugins:v1.6.0-build20241022
EOF

xargs -n1 -t docker image pull --quiet << EOF > build/images-calico.txt
Expand Down Expand Up @@ -77,8 +77,8 @@ EOF
fi

xargs -n1 -t docker image pull --quiet << EOF > build/images-multus.txt
${REGISTRY}/rancher/hardened-multus-cni:v4.1.2-build20241011
${REGISTRY}/rancher/hardened-cni-plugins:v1.5.1-build20241009
${REGISTRY}/rancher/hardened-multus-cni:v4.1.3-build20241028
${REGISTRY}/rancher/hardened-cni-plugins:v1.6.0-build20241022
${REGISTRY}/rancher/hardened-whereabouts:v0.8.0-build20241011
${REGISTRY}/rancher/mirrored-library-busybox:1.36.1
EOF
Expand All @@ -94,8 +94,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.7-build20241008
${REGISTRY}/rancher/hardened-cni-plugins:v1.5.1-build20241009
${REGISTRY}/rancher/hardened-flannel:v0.26.0-build20241024
${REGISTRY}/rancher/hardened-cni-plugins:v1.6.0-build20241022
EOF
fi
# Continue to provide a legacy airgap archive set with the default CNI images
Expand Down

0 comments on commit 2639138

Please sign in to comment.