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.26] Update Calico to v3.26.1 #4424

Merged
merged 1 commit into from
Jul 7, 2023
Merged

[Release 1.26] Update Calico to v3.26.1 #4424

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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,8 @@ COPY charts/ /charts/
RUN echo ${CACHEBUST}>/dev/null
RUN CHART_VERSION="1.13.200" CHART_FILE=/charts/rke2-cilium.yaml CHART_BOOTSTRAP=true /charts/build-chart.sh
RUN CHART_VERSION="v3.25.1-build2023051201" CHART_FILE=/charts/rke2-canal.yaml CHART_BOOTSTRAP=true /charts/build-chart.sh
RUN CHART_VERSION="v3.25.002" CHART_FILE=/charts/rke2-calico.yaml CHART_BOOTSTRAP=true /charts/build-chart.sh
RUN CHART_VERSION="v3.25.002" CHART_FILE=/charts/rke2-calico-crd.yaml CHART_BOOTSTRAP=true /charts/build-chart.sh
RUN CHART_VERSION="v3.26.100" CHART_FILE=/charts/rke2-calico.yaml CHART_BOOTSTRAP=true /charts/build-chart.sh
RUN CHART_VERSION="v3.26.100" CHART_FILE=/charts/rke2-calico-crd.yaml CHART_BOOTSTRAP=true /charts/build-chart.sh
RUN CHART_VERSION="1.24.002" CHART_FILE=/charts/rke2-coredns.yaml CHART_BOOTSTRAP=true /charts/build-chart.sh
RUN CHART_VERSION="4.5.201" CHART_FILE=/charts/rke2-ingress-nginx.yaml CHART_BOOTSTRAP=false /charts/build-chart.sh
RUN CHART_VERSION="2.11.100-build2023051508" CHART_FILE=/charts/rke2-metrics-server.yaml CHART_BOOTSTRAP=false /charts/build-chart.sh
Expand Down
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 @@ -43,8 +43,8 @@ FROM build as windows-runtime-collect
ARG KUBERNETES_VERSION=dev

# windows runtime image
ENV CRICTL_VERSION="v1.25.0"
ENV CALICO_VERSION="v3.25.0"
ENV CRICTL_VERSION="v1.26.0"
ENV CALICO_VERSION="v3.26.1"
ENV CNI_PLUGIN_VERSION="v1.1.1"

RUN mkdir -p rancher
Expand Down
18 changes: 9 additions & 9 deletions scripts/build-images
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,18 +45,18 @@ xargs -n1 -t docker image pull --quiet << EOF > build/images-cilium.txt
${REGISTRY}/rancher/mirrored-cilium-operator-aws:v1.13.2
${REGISTRY}/rancher/mirrored-cilium-operator-azure:v1.13.2
${REGISTRY}/rancher/mirrored-cilium-operator-generic:v1.13.2
${REGISTRY}/rancher/hardened-cni-plugins:v1.0.1-build20221011
${REGISTRY}/rancher/hardened-cni-plugins:v1.2.0-build20230523
EOF

xargs -n1 -t docker image pull --quiet << EOF > build/images-calico.txt
${REGISTRY}/rancher/mirrored-calico-operator:v1.29.0
${REGISTRY}/rancher/mirrored-calico-ctl:v3.25.0
${REGISTRY}/rancher/mirrored-calico-kube-controllers:v3.25.0
${REGISTRY}/rancher/mirrored-calico-typha:v3.25.0
${REGISTRY}/rancher/mirrored-calico-node:v3.25.0
${REGISTRY}/rancher/mirrored-calico-pod2daemon-flexvol:v3.25.0
${REGISTRY}/rancher/mirrored-calico-cni:v3.25.0
${REGISTRY}/rancher/mirrored-calico-apiserver:v3.25.0
${REGISTRY}/rancher/mirrored-calico-operator:v1.30.4
${REGISTRY}/rancher/mirrored-calico-ctl:v3.26.1
${REGISTRY}/rancher/mirrored-calico-kube-controllers:v3.26.1
${REGISTRY}/rancher/mirrored-calico-typha:v3.26.1
${REGISTRY}/rancher/mirrored-calico-node:v3.26.1
${REGISTRY}/rancher/mirrored-calico-pod2daemon-flexvol:v3.26.1
${REGISTRY}/rancher/mirrored-calico-cni:v3.26.1
${REGISTRY}/rancher/mirrored-calico-apiserver:v3.26.1
EOF

xargs -n1 -t docker image pull --quiet << EOF > build/images-vsphere.txt
Expand Down