diff options
| author | fisherxu <xufei40@huawei.com> | 2023-08-01 17:21:19 +0800 |
|---|---|---|
| committer | fisherxu <xufei40@huawei.com> | 2023-08-01 17:38:01 +0800 |
| commit | e81a17105628c4cb8778c9b24a14aa0f6e45bd39 (patch) | |
| tree | 1dfb75f29e1aed5301904df47d75e4170dafe3e1 /hack | |
| parent | Merge pull request #4909 from QiQi-OvO/annotation-fix (diff) | |
| download | kubeedge-e81a17105628c4cb8778c9b24a14aa0f6e45bd39.tar.gz | |
fix the wrong value for cni overwrite
Signed-off-by: fisherxu <xufei40@huawei.com>
Diffstat (limited to 'hack')
| -rwxr-xr-x | hack/lib/install.sh | 2 | ||||
| -rwxr-xr-x | hack/local-up-kubeedge.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/hack/lib/install.sh b/hack/lib/install.sh index ecfa1e984..4dbe3cd1d 100755 --- a/hack/lib/install.sh +++ b/hack/lib/install.sh @@ -99,7 +99,7 @@ function install_cni_plugins() { CNI_DOWNLOAD_ADDR=${CNI_DOWNLOAD_ADDR:-"https://github.com/containernetworking/plugins/releases/download/v1.1.1/cni-plugins-linux-amd64-v1.1.1.tgz"} CNI_PKG=${CNI_DOWNLOAD_ADDR##*/} CNI_CONF_OVERWRITE=${CNI_CONF_OVERWRITE:-"true"} - echo -e "The installation of the cni plugin will overwrite the cni config file. Use export CNI_CONFIG_FILE=false to disable it." + echo -e "The installation of the cni plugin will overwrite the cni config file. Use export CNI_CONF_OVERWRITE=false to disable it." # install CNI plugins if not exist if [ ! -f "/opt/cni/bin/loopback" ]; then diff --git a/hack/local-up-kubeedge.sh b/hack/local-up-kubeedge.sh index 42009e221..8a5168496 100755 --- a/hack/local-up-kubeedge.sh +++ b/hack/local-up-kubeedge.sh @@ -21,7 +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." +echo -e "The installation of the cni plugin will overwrite the cni config file. Use export CNI_CONF_OVERWRITE=false to disable it." if [[ "${CLUSTER_NAME}x" == "x" ]];then CLUSTER_NAME="test" |