diff options
| author | KubeEdge Bot <48982446+kubeedge-bot@users.noreply.github.com> | 2021-01-14 21:53:45 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-14 21:53:45 +0800 |
| commit | e30f6f34a836ae9b4e71d525f7470669aa7673bb (patch) | |
| tree | ab752675d7e8f347d307611489a55e70c4539245 /hack | |
| parent | Merge pull request #2500 from daixiang0/types_test (diff) | |
| parent | local-up-kubeedge.sh: make wait-time configurable (diff) | |
| download | kubeedge-e30f6f34a836ae9b4e71d525f7470669aa7673bb.tar.gz | |
Merge pull request #2495 from llhuii/fix-localup-script
Optimize hack/local-up-kubeedge.sh
Diffstat (limited to 'hack')
| -rwxr-xr-x | hack/local-up-kubeedge.sh | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/hack/local-up-kubeedge.sh b/hack/local-up-kubeedge.sh index fa79afb53..0cd2d9a5f 100755 --- a/hack/local-up-kubeedge.sh +++ b/hack/local-up-kubeedge.sh @@ -17,6 +17,7 @@ KUBEEDGE_ROOT=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/.. ENABLE_DAEMON=${ENABLE_DAEMON:-false} LOG_DIR=${LOG_DIR:-"/tmp"} +TIMEOUT=${TIMEOUT:-60}s if [[ "${CLUSTER_NAME}x" == "x" ]];then CLUSTER_NAME="test" @@ -95,6 +96,7 @@ function start_cloudcore { ${CLOUD_BIN} --minconfig > ${CLOUD_CONFIGFILE} sed -i '/modules:/a\ cloudStream:\n enable: true\n streamPort: 10003\n tlsStreamCAFile: /etc/kubeedge/ca/streamCA.crt\n tlsStreamCertFile: /etc/kubeedge/certs/stream.crt\n tlsStreamPrivateKeyFile: /etc/kubeedge/certs/stream.key\n tlsTunnelCAFile: /etc/kubeedge/ca/rootCA.crt\n tlsTunnelCertFile: /etc/kubeedge/certs/server.crt\n tlsTunnelPrivateKeyFile: /etc/kubeedge/certs/server.key\n tunnelPort: 10004' ${CLOUD_CONFIGFILE} sed -i -e "s|kubeConfig: .*|kubeConfig: ${KUBECONFIG}|g" \ + -e "s|/var/lib/kubeedge/|/tmp&|g" \ -e "s|/etc/|/tmp/etc/|g" ${CLOUD_CONFIGFILE} CLOUDCORE_LOG=${LOG_DIR}/cloudcore.log echo "start cloudcore..." @@ -121,6 +123,7 @@ function start_edgecore { sed -i -e "s|token: .*|token: ${token}|g" \ -e "s|hostnameOverride: .*|hostnameOverride: edge-node|g" \ -e "s|/etc/|/tmp/etc/|g" \ + -e "s|/var/lib/kubeedge/|/tmp&|g" \ -e "s|mqttMode: .*|mqttMode: 0|g" ${EDGE_CONFIGFILE} EDGECORE_LOG=${LOG_DIR}/edgecore.log @@ -133,7 +136,7 @@ function start_edgecore { function check_control_plane_ready { echo "wait the control-plane ready..." - kubectl wait --for=condition=Ready node/test-control-plane --timeout=60s + kubectl wait --for=condition=Ready node/${CLUSTER_NAME}-control-plane --timeout=${TIMEOUT} } # Check if all processes are still running. Prints a warning once each time |