diff options
| author | zhengxinwei <zhengxinwei@huawei.com> | 2023-07-26 10:30:29 +0800 |
|---|---|---|
| committer | zhengxinwei <zhengxinwei@huawei.com> | 2023-07-31 14:40:48 +0800 |
| commit | d867aadef495cb874d242e4b9e940c1242e46fef (patch) | |
| tree | c0ff9928567b465f96e6484ca6543be48f4c0959 /hack/local-up-kubeedge.sh | |
| parent | Merge pull request #4884 from fisherxu/check-e2e (diff) | |
| download | kubeedge-d867aadef495cb874d242e4b9e940c1242e46fef.tar.gz | |
fix the bug in local-up mode that causes cni to not launch
Signed-off-by: zhengxinwei <zhengxinwei@huawei.com>
Diffstat (limited to 'hack/local-up-kubeedge.sh')
| -rwxr-xr-x | hack/local-up-kubeedge.sh | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/hack/local-up-kubeedge.sh b/hack/local-up-kubeedge.sh index 9535621d4..42009e221 100755 --- a/hack/local-up-kubeedge.sh +++ b/hack/local-up-kubeedge.sh @@ -21,6 +21,7 @@ LOG_LEVEL=${LOG_LEVEL:-2} TIMEOUT=${TIMEOUT:-60}s PROTOCOL=${PROTOCOL:-"WebSocket"} CONTAINER_RUNTIME=${CONTAINER_RUNTIME:-"remote"} +echo -e "The installation of the cni plugin will overwrite the cni config file. Use export CNI_CONFIG_FILE=false to disable it." if [[ "${CLUSTER_NAME}x" == "x" ]];then CLUSTER_NAME="test" @@ -254,12 +255,6 @@ build_edgecore kind_up_cluster -# install CNI plugins -if [[ "${CONTAINER_RUNTIME}" = "remote" ]]; then - # we need to install CNI plugins only when we use remote(containerd) as edgecore container runtime - install_cni_plugins -fi - export KUBECONFIG=$HOME/.kube/config check_control_plane_ready @@ -278,6 +273,12 @@ generate_streamserver_cert start_cloudcore +# install CNI plugins +if [[ "${CONTAINER_RUNTIME}" = "remote" ]]; then +# we need to install CNI plugins only when we use remote(containerd) as edgecore container runtime +install_cni_plugins +fi + sleep 2 start_edgecore |