From 0a9a6c9e53f71a4427edcb3074e1aa11e39397aa Mon Sep 17 00:00:00 2001 From: Roberto Bonafiglia Date: Fri, 2 Dec 2022 20:34:07 +0100 Subject: [PATCH] Updated cilium version and added new cilium images Signed-off-by: Roberto Bonafiglia --- Dockerfile | 2 +- scripts/build-images | 14 ++++++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 295c5ba2d7..fbdd8be5cb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -117,7 +117,7 @@ ARG KUBERNETES_VERSION="" ARG CACHEBUST="cachebust" COPY charts/ /charts/ RUN echo ${CACHEBUST}>/dev/null -RUN CHART_VERSION="1.12.302" CHART_FILE=/charts/rke2-cilium.yaml CHART_BOOTSTRAP=true /charts/build-chart.sh +RUN CHART_VERSION="1.12.401" CHART_FILE=/charts/rke2-cilium.yaml CHART_BOOTSTRAP=true /charts/build-chart.sh RUN CHART_VERSION="v3.24.5-build2022120101" CHART_FILE=/charts/rke2-canal.yaml CHART_BOOTSTRAP=true /charts/build-chart.sh RUN CHART_VERSION="v3.24.501" CHART_FILE=/charts/rke2-calico.yaml CHART_BOOTSTRAP=true /charts/build-chart.sh RUN CHART_VERSION="v3.24.501" 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 7e7b04ffd5..de63d1f79f 100755 --- a/scripts/build-images +++ b/scripts/build-images @@ -33,10 +33,16 @@ EOF if [ "${GOARCH}" != "s390x" ]; then xargs -n1 -t docker image pull --quiet << EOF > build/images-cilium.txt - ${REGISTRY}/rancher/mirrored-cilium-cilium:v1.12.3 - ${REGISTRY}/rancher/mirrored-cilium-operator-aws:v1.12.3 - ${REGISTRY}/rancher/mirrored-cilium-operator-azure:v1.12.3 - ${REGISTRY}/rancher/mirrored-cilium-operator-generic:v1.12.3 + ${REGISTRY}/rancher/mirrored-cilium-certgen:v0.1.8 + ${REGISTRY}/rancher/mirrored-cilium-cilium:v1.12.4 + ${REGISTRY}/rancher/mirrored-cilium-cilium-etcd-operator:v2.0.7 + ${REGISTRY}/rancher/mirrored-cilium-clustermesh-apiserver:v1.12.4 + ${REGISTRY}/rancher/mirrored-cilium-hubble-relay:v1.12.4 + ${REGISTRY}/rancher/mirrored-cilium-hubble-ui:v0.9.2 + ${REGISTRY}/rancher/mirrored-cilium-hubble-ui-backend:v0.9.2 + ${REGISTRY}/rancher/mirrored-cilium-operator-aws:v1.12.4 + ${REGISTRY}/rancher/mirrored-cilium-operator-azure:v1.12.4 + ${REGISTRY}/rancher/mirrored-cilium-operator-generic:v1.12.4 ${REGISTRY}/rancher/hardened-cni-plugins:v1.0.1-build20221011 EOF