diff options
| author | zhangjie <iamkadisi@163.com> | 2019-09-29 17:19:13 +0800 |
|---|---|---|
| committer | zhangjie <iamkadisi@163.com> | 2019-09-29 17:19:13 +0800 |
| commit | a9b57cc03aa8907382c36daa860d1b8895571136 (patch) | |
| tree | 5e364d5ac0535c66684a3db018885e7321c2f736 /edge | |
| parent | Merge pull request #1148 from beautytiger/dev-190923-cleanup (diff) | |
| download | kubeedge-a9b57cc03aa8907382c36daa860d1b8895571136.tar.gz | |
change fb4ebb70-2783-42b8-b3ef-63e2fd6d242e to edge-node
Signed-off-by: zhangjie <iamkadisi@163.com>
Diffstat (limited to 'edge')
| -rw-r--r-- | edge/conf/edge.yaml | 6 | ||||
| -rw-r--r-- | edge/pkg/edgehub/config/config_test.go | 14 | ||||
| -rw-r--r-- | edge/test/README.md | 4 | ||||
| -rwxr-xr-x | edge/test/integration/scripts/fast_test | 2 |
4 files changed, 13 insertions, 13 deletions
diff --git a/edge/conf/edge.yaml b/edge/conf/edge.yaml index 6a5deedfb..079814494 100644 --- a/edge/conf/edge.yaml +++ b/edge/conf/edge.yaml @@ -8,7 +8,7 @@ mqtt: edgehub: websocket: - url: wss://0.0.0.0:10000/e632aba927ea4ac2b575ec1603d56f10/fb4ebb70-2783-42b8-b3ef-63e2fd6d242e/events + url: wss://0.0.0.0:10000/e632aba927ea4ac2b575ec1603d56f10/edge-node/events certfile: /etc/kubeedge/certs/edge.crt keyfile: /etc/kubeedge/certs/edge.key handshake-timeout: 30 #second @@ -26,11 +26,11 @@ edgehub: protocol: websocket # websocket, quic heartbeat: 15 # second project-id: e632aba927ea4ac2b575ec1603d56f10 - node-id: fb4ebb70-2783-42b8-b3ef-63e2fd6d242e + node-id: edge-node edged: register-node-namespace: default - hostname-override: fb4ebb70-2783-42b8-b3ef-63e2fd6d242e + hostname-override: edge-node interface-name: eth0 edged-memory-capacity-bytes: 7852396000 node-status-update-frequency: 10 # second diff --git a/edge/pkg/edgehub/config/config_test.go b/edge/pkg/edgehub/config/config_test.go index 42805f4fd..694ea1841 100644 --- a/edge/pkg/edgehub/config/config_test.go +++ b/edge/pkg/edgehub/config/config_test.go @@ -141,7 +141,7 @@ func TestGetConfig(t *testing.T) { HeartbeatPeroid: "150", RefreshInterval: "15", ProjectID: defaultProjectID, - NodeID: "fb4ebb70-2783-42b8-b3ef-63e2fd6d242e", + NodeID: "edge-node", }, }, }, @@ -167,7 +167,7 @@ func TestGetConfig(t *testing.T) { Protocol: "websocket", HeartbeatPeriod: 150 * time.Second, ProjectID: defaultProjectID, - NodeID: "fb4ebb70-2783-42b8-b3ef-63e2fd6d242e", + NodeID: "edge-node", }, }}, @@ -189,7 +189,7 @@ func TestGetConfig(t *testing.T) { controllerConfigYaml{ Protocol: "websocket", ProjectID: defaultProjectID, - NodeID: "fb4ebb70-2783-42b8-b3ef-63e2fd6d242e", + NodeID: "edge-node", }, }, }, @@ -215,7 +215,7 @@ func TestGetConfig(t *testing.T) { Protocol: "websocket", HeartbeatPeriod: 15 * time.Second, ProjectID: defaultProjectID, - NodeID: "fb4ebb70-2783-42b8-b3ef-63e2fd6d242e", + NodeID: "edge-node", }, }}, } @@ -372,7 +372,7 @@ func Test_getControllerConfig(t *testing.T) { HeartbeatPeroid: "150", RefreshInterval: "15", ProjectID: defaultProjectID, - NodeID: "fb4ebb70-2783-42b8-b3ef-63e2fd6d242e", + NodeID: "edge-node", }, }, }, @@ -387,7 +387,7 @@ func Test_getControllerConfig(t *testing.T) { controllerConfigYaml{ Protocol: "websocket", ProjectID: defaultProjectID, - NodeID: "fb4ebb70-2783-42b8-b3ef-63e2fd6d242e", + NodeID: "edge-node", }, }, }, @@ -403,7 +403,7 @@ func Test_getControllerConfig(t *testing.T) { Protocol: "websocket", HeartbeatPeroid: "150", RefreshInterval: "15", - NodeID: "fb4ebb70-2783-42b8-b3ef-63e2fd6d242e", + NodeID: "edge-node", }, }, }, diff --git a/edge/test/README.md b/edge/test/README.md index 9c2a68e83..cc84a7de2 100644 --- a/edge/test/README.md +++ b/edge/test/README.md @@ -83,7 +83,7 @@ edgehub: auth-info-files-path: /var/IEF/secret placement-url: https://10.154.193.32:7444/v1/placement_external/message_queue project-id: e632aba927ea4ac2b575ec1603d56f10 - node-id: fb4ebb70-2783-42b8-b3ef-63e2fd6d242e + node-id: edge-node edged: register-node-namespace: default @@ -236,4 +236,4 @@ curl -i -v -X DELETE http://127.0.0.1:12345/pod -d '{ ] } }' -```
\ No newline at end of file +``` diff --git a/edge/test/integration/scripts/fast_test b/edge/test/integration/scripts/fast_test index a93652db2..31c567bd5 100755 --- a/edge/test/integration/scripts/fast_test +++ b/edge/test/integration/scripts/fast_test @@ -32,7 +32,7 @@ cat >config.json<<END "testManager": "http://127.0.0.1:12345", "edgedEndpoint": "http://127.0.0.1:10255", "image_url": ["nginx:latest", "redis:latest"], - "nodeId": "fb4ebb70-2783-42b8-b3ef-63e2fd6d242e" + "nodeId": "edge-node" } END |