github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #3029 from ddysher/get-err-code 

Fix node Get() error code
pull/6/head
bgrant0607 2014-12-18 09:52:45 -08:00
parent eed5252993 677f68ec02
commit 0892fd3d6d
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/registry/etcd/etcd.go
View File

@ -604,7 +604,7 @@ func (r *Registry) GetMinion(ctx api.Context, minionID string) (*api.Node, error
key := makeNodeKey(minionID) key := makeNodeKey(minionID)
err := r.ExtractObj(key, &minion, false) err := r.ExtractObj(key, &minion, false)
if err != nil { if err != nil {
return nil, etcderr.InterpretGetError(err, "minion", minion.Name) return nil, etcderr.InterpretGetError(err, "minion", minionID)
} }
return &minion, nil return &minion, nil
} }

3
pkg/registry/minion/healthy_registry.go
View File

@ -40,6 +40,9 @@ func NewHealthyRegistry(delegate Registry, client client.KubeletHealthChecker) R
func (r *HealthyRegistry) GetMinion(ctx api.Context, minionID string) (*api.Node, error) { func (r *HealthyRegistry) GetMinion(ctx api.Context, minionID string) (*api.Node, error) {
minion, err := r.delegate.GetMinion(ctx, minionID) minion, err := r.delegate.GetMinion(ctx, minionID)
if err != nil {
return minion, err
}
if minion == nil { if minion == nil {
return nil, ErrDoesNotExist return nil, ErrDoesNotExist
} }

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

@ -86,6 +86,9 @@ func (rs *REST) Delete(ctx api.Context, id string) (<-chan apiserver.RESTResult,
// Get satisfies the RESTStorage interface. // Get satisfies the RESTStorage interface.
func (rs *REST) Get(ctx api.Context, id string) (runtime.Object, error) { func (rs *REST) Get(ctx api.Context, id string) (runtime.Object, error) {
minion, err := rs.registry.GetMinion(ctx, id) minion, err := rs.registry.GetMinion(ctx, id)
if err != nil {
return minion, err
}
if minion == nil { if minion == nil {
return nil, ErrDoesNotExist return nil, ErrDoesNotExist
} }