From bfb38658ed300fff486e5a6d6b3f3629008f6827 Mon Sep 17 00:00:00 2001 From: Derek Nola Date: Wed, 4 Oct 2023 10:30:08 -0700 Subject: [PATCH] bump cilium to 1.14.2 Signed-off-by: Derek Nola --- Dockerfile | 2 +- scripts/build-images | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index 939c0572b3..467067d54f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -105,7 +105,7 @@ ARG KUBERNETES_VERSION="" ARG CACHEBUST="cachebust" COPY charts/ /charts/ RUN echo ${CACHEBUST}>/dev/null -RUN CHART_VERSION="1.14.100" CHART_FILE=/charts/rke2-cilium.yaml CHART_BOOTSTRAP=true /charts/build-chart.sh +RUN CHART_VERSION="1.14.200" CHART_FILE=/charts/rke2-cilium.yaml CHART_BOOTSTRAP=true /charts/build-chart.sh RUN CHART_VERSION="v3.26.1-build2023080200" CHART_FILE=/charts/rke2-canal.yaml CHART_BOOTSTRAP=true /charts/build-chart.sh RUN CHART_VERSION="v3.26.101" CHART_FILE=/charts/rke2-calico.yaml CHART_BOOTSTRAP=true /charts/build-chart.sh RUN CHART_VERSION="v3.26.101" CHART_FILE=/charts/rke2-calico-crd.yaml CHART_BOOTSTRAP=true /charts/build-chart.sh diff --git a/scripts/build-images b/scripts/build-images index 6220eaee61..4259658ebb 100755 --- a/scripts/build-images +++ b/scripts/build-images @@ -36,17 +36,17 @@ EOF if [ "${GOARCH}" != "s390x" ] && [ "${GOARCH}" != "arm64" ]; then xargs -n1 -t docker image pull --quiet << EOF > build/images-cilium.txt ${REGISTRY}/rancher/mirrored-cilium-certgen:v0.1.8 - ${REGISTRY}/rancher/mirrored-cilium-cilium:v1.14.1 + ${REGISTRY}/rancher/mirrored-cilium-cilium:v1.14.2 ${REGISTRY}/rancher/mirrored-cilium-cilium-envoy:v1.25.9-f039e2bd380b7eef2f2feea5750676bb36133699 ${REGISTRY}/rancher/mirrored-cilium-cilium-etcd-operator:v2.0.7 - ${REGISTRY}/rancher/mirrored-cilium-clustermesh-apiserver:v1.14.1 - ${REGISTRY}/rancher/mirrored-cilium-hubble-relay:v1.14.1 + ${REGISTRY}/rancher/mirrored-cilium-clustermesh-apiserver:v1.14.2 + ${REGISTRY}/rancher/mirrored-cilium-hubble-relay:v1.14.2 ${REGISTRY}/rancher/mirrored-cilium-hubble-ui:v0.12.0 ${REGISTRY}/rancher/mirrored-cilium-hubble-ui-backend:v0.12.0 - ${REGISTRY}/rancher/mirrored-cilium-kvstoremesh:v1.14.1 - ${REGISTRY}/rancher/mirrored-cilium-operator-aws:v1.14.1 - ${REGISTRY}/rancher/mirrored-cilium-operator-azure:v1.14.1 - ${REGISTRY}/rancher/mirrored-cilium-operator-generic:v1.14.1 + ${REGISTRY}/rancher/mirrored-cilium-kvstoremesh:v1.14.2 + ${REGISTRY}/rancher/mirrored-cilium-operator-aws:v1.14.2 + ${REGISTRY}/rancher/mirrored-cilium-operator-azure:v1.14.2 + ${REGISTRY}/rancher/mirrored-cilium-operator-generic:v1.14.2 ${REGISTRY}/rancher/hardened-cni-plugins:v1.2.0-build20230523 EOF