diff options
| author | KubeEdge Bot <48982446+kubeedge-bot@users.noreply.github.com> | 2020-04-21 14:57:34 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-21 14:57:34 +0800 |
| commit | 1296923ebfa7487a6466c82a94ffc7149e93cf7b (patch) | |
| tree | a4b1fdc756523d46934a997f80f813858fe26595 | |
| parent | Merge pull request #1407 from fisherxu/add-pod-delete (diff) | |
| parent | Add built-in labels when auto registering node (diff) | |
| download | kubeedge-1.3.0-alpha.0.tar.gz | |
Merge pull request #1601 from kevin-wangzefeng/node-labelsv1.3.0-alpha.0
Add built-in labels when auto registering node
| -rw-r--r-- | cloud/pkg/edgecontroller/controller/upstream.go | 8 | ||||
| -rw-r--r-- | edge/pkg/edged/edged_status.go | 11 |
2 files changed, 11 insertions, 8 deletions
diff --git a/cloud/pkg/edgecontroller/controller/upstream.go b/cloud/pkg/edgecontroller/controller/upstream.go index 056c134c5..d26ba823f 100644 --- a/cloud/pkg/edgecontroller/controller/upstream.go +++ b/cloud/pkg/edgecontroller/controller/upstream.go @@ -320,14 +320,6 @@ func (uc *UpstreamController) updatePodStatus() { // createNode create new edge node to kubernetes func (uc *UpstreamController) createNode(name string, node *v1.Node) (*v1.Node, error) { node.Name = name - - //add default labels - if node.Labels == nil { - node.Labels = make(map[string]string) - } - node.Labels["name"] = name - node.Labels["node-role.kubernetes.io/edge"] = "" - return uc.kubeClient.CoreV1().Nodes().Create(node) } diff --git a/edge/pkg/edged/edged_status.go b/edge/pkg/edged/edged_status.go index e45c323f0..6ccdd111e 100644 --- a/edge/pkg/edged/edged_status.go +++ b/edge/pkg/edged/edged_status.go @@ -76,6 +76,17 @@ func (e *edged) initialNode() (*v1.Node, error) { hostname = e.nodeName } + node.Labels = map[string]string{ + // Kubernetes built-in labels + v1.LabelHostname: hostname, + v1.LabelOSStable: runtime.GOOS, + v1.LabelArchStable: runtime.GOARCH, + + // KubeEdge specific labels + "node-role.kubernetes.io/edge": "", + "node-role.kubernetes.io/agent": "", + } + ip, err := e.getIP() if err != nil { return nil, err |