Merge pull request #337 from xiaods/dev

update cilium/nerdctl verseion
xiaods · Nov 18, 2023 · b66f68b · b66f68b
2 parents 5cf9e5c + 8ef1683
commit b66f68b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/contrib/install.sh b/contrib/install.sh
@@ -458,8 +458,9 @@ setup_cilium() {
     case "${INSTALL_K8E_EXEC}" in
         *"cluster-init"*) info "Installing cilium network cni/operator"
         $SUDO chmod 644 /etc/${SYSTEM_NAME}/${SYSTEM_NAME}.yaml
+        [ -z ${API_SERVER_IP} ] && API_SERVER_IP="127.0.0.1"
         # cilium helm values https://github.com/cilium/cilium/tree/master/install/kubernetes/cilium
-        $SUDO KUBECONFIG=/etc/${SYSTEM_NAME}/${SYSTEM_NAME}.yaml $BIN_DIR/cilium install --version=1.14.1 --helm-set ipam.operator.clusterPoolIPv4PodCIDRList=["10.42.0.0/16"];;
+        $SUDO KUBECONFIG=/etc/${SYSTEM_NAME}/${SYSTEM_NAME}.yaml $BIN_DIR/cilium install --version=1.14.4 --set image.useDigest=false --set operator.image.useDigest=false --set ipam.operator.clusterPoolIPv4PodCIDRList="10.42.0.0/16" --set k8sServiceHost=${API_SERVER_IP};;
     esac
 }
 

diff --git a/hack/airgap/image-list.txt b/hack/airgap/image-list.txt
@@ -4,5 +4,5 @@ docker.io/rancher/mirrored-coredns-coredns:1.10.1
 docker.io/rancher/mirrored-library-busybox:1.36.1
 docker.io/rancher/mirrored-metrics-server:v0.6.3
 docker.io/rancher/mirrored-pause:3.6
-quay.io/cilium/cilium:v1.14.1
-quay.io/cilium/operator-generic:v1.14.1
+quay.io/cilium/cilium:v1.14.4
+quay.io/cilium/operator-generic:v1.14.4
diff --git a/hack/download b/hack/download
@@ -9,8 +9,8 @@ CONTAINERD_DIR=build/src/github.com/containerd/containerd
 HCSSHIM_DIR=build/src/github.com/microsoft/hcsshim
 DATA_DIR=build/data
 CHARTS_DIR=build/static/charts
-NERDCTL_VERSION=1.5.0
-CILIUMCLI_VERSION=v0.15.7
+NERDCTL_VERSION=1.7.0
+CILIUMCLI_VERSION=v0.15.14
 
 umask 022
 rm -rf ${CHARTS_DIR}