From a172e0a240d9cf73abadcaacab68a8e056d75468 Mon Sep 17 00:00:00 2001 From: Deshi Xiao Date: Sat, 24 Sep 2022 11:53:16 +0800 Subject: [PATCH] upgrade Cilium to v1.21.2 Signed-off-by: Deshi Xiao --- contrib/install.sh | 3 ++- hack/airgap/image-list.txt | 4 ++-- hack/download | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/contrib/install.sh b/contrib/install.sh index 6dc1075a..aae58b6a 100644 --- a/contrib/install.sh +++ b/contrib/install.sh @@ -462,7 +462,8 @@ setup_cilium() { case "${INSTALL_K8E_EXEC}" in *"cluster-init"*) info "Installing cilium network cni/operator" $SUDO chmod 644 /etc/${SYSTEM_NAME}/${SYSTEM_NAME}.yaml - KUBECONFIG=/etc/${SYSTEM_NAME}/${SYSTEM_NAME}.yaml cilium install --helm-set ipam.operator.clusterPoolIPv4PodCIDR="10.42.0.0/16";; + # cilium helm values https://github.com/cilium/cilium/tree/master/install/kubernetes/cilium + KUBECONFIG=/etc/${SYSTEM_NAME}/${SYSTEM_NAME}.yaml cilium install --helm-set ipam.operator.clusterPoolIPv4PodCIDRList=["10.42.0.0/16"];; esac } diff --git a/hack/airgap/image-list.txt b/hack/airgap/image-list.txt index 2aff88b4..ebfea487 100644 --- a/hack/airgap/image-list.txt +++ b/hack/airgap/image-list.txt @@ -3,5 +3,5 @@ docker.io/rancher/mirrored-coredns-coredns:1.9.1 docker.io/rancher/mirrored-library-busybox:1.34.1 docker.io/rancher/mirrored-metrics-server:v0.5.2 docker.io/rancher/mirrored-pause:3.6 -quay.io/cilium/cilium:v1.12.1 -quay.io/cilium/operator-generic:v1.12.1 +quay.io/cilium/cilium:v1.12.2 +quay.io/cilium/operator-generic:v1.12.2 diff --git a/hack/download b/hack/download index 2013b8de..45dcf06a 100755 --- a/hack/download +++ b/hack/download @@ -9,7 +9,7 @@ CONTAINERD_DIR=build/src/github.com/containerd/containerd DATA_DIR=build/data CHARTS_DIR=build/static/charts NERDCTL_VERSION=0.22.2 -CILIUMCLI_VERSION=v0.12.3 +CILIUMCLI_VERSION=v0.12.4 OSMEDGE_VERSION=v1.1.0 umask 022