github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-05 07:27:21 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #15837 from feihujiang/removeUselessCodesAboutMinion

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2015-10-21 09:05:46 -07:00
parent 071d21257f a456b4c424
commit a5a917603c
6 changed files with 2 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/controller/node/nodecontroller_test.go
View File

@@ -75,7 +75,7 @@ func (m *FakeNodeHandler) Create(node *api.Node) (*api.Node, error) {
}()
for _, n := range m.Existing {
if n.Name == node.Name {
return nil, apierrors.NewAlreadyExists("Minion", node.Name)
return nil, apierrors.NewAlreadyExists("Node", node.Name)
}
}
if m.CreateHook == nil || m.CreateHook(m, node) {