diff --git a/example/config.yml b/example/config.yml index a988b39..53e9112 100644 --- a/example/config.yml +++ b/example/config.yml @@ -160,7 +160,6 @@ FIREWALL_ENABLE: true # [kube-router]kube-router 镜像版本 kube_router_ver: "__kube_router__" -busybox_ver: "1.28.4" ############################ diff --git a/ezctl b/ezctl index 2bfc669..4e33d58 100755 --- a/ezctl +++ b/ezctl @@ -239,15 +239,15 @@ function setup() { k8s_ver=$(bin/kube-apiserver --version|cut -d' ' -f2) etcd_ver=v$(bin/etcd --version|grep 'etcd Version'|cut -d' ' -f3) - network_cni=$(grep CLUSTER_NETWORK "clusters/$1/hosts"|cut -d'"' -f2) - network_cni_ver=$(grep "${network_cni}Ver" ezdown|cut -d'=' -f2|head -n1) + network_cni=$(grep CLUSTER_NETWORK "clusters/$1/hosts"|cut -d'"' -f2|sed 's/-//g') + network_cni_ver=$(grep -i "${network_cni}Ver" ezdown|cut -d'=' -f2|head -n1) cat <