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

Merge pull request #2305 from ddysher/rm-create-check

Browse Source 
Remove health check when creating node.
This commit is contained in:
Daniel Smith 2014-11-13 13:17:15 -08:00
commit d6777557d1
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/registry/minion/rest.go
View File

@ -60,21 +60,14 @@ func (rs *REST) Create(ctx api.Context, obj runtime.Object) (<-chan apiserver.RE
minion.CreationTimestamp = util.Now()
return apiserver.MakeAsync(func() (runtime.Object, error) {
// TODO: Need to fill in any server-set fields (uid, timestamp, etc) before
// returning minion. Can't do it properly at the moment because the registry
// healthchecking, which might cause it to not return the minion at all. Fix
// this after we move the healthchecking out of the minion registry.
err := rs.registry.CreateMinion(ctx, minion)
if err != nil {
return nil, err
}
minionName := minion.Name
minion, err := rs.registry.GetMinion(ctx, minionName)
if err == ErrNotHealty {
return rs.toApiMinion(minionName), nil
}
if minion == nil {
return nil, ErrDoesNotExist
}
if err != nil {
return nil, err
}
return minion, nil
}), nil
}