From 677f68ec02ff304ebe8ea15813204949293d2d9f Mon Sep 17 00:00:00 2001 From: Deyuan Deng Date: Thu, 18 Dec 2014 15:34:04 +0800 Subject: [PATCH] Fix node Get() error code --- pkg/registry/etcd/etcd.go | 2 +- pkg/registry/minion/healthy_registry.go | 3 +++ pkg/registry/minion/rest.go | 3 +++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/pkg/registry/etcd/etcd.go b/pkg/registry/etcd/etcd.go index 58779203848..d372f75bea4 100644 --- a/pkg/registry/etcd/etcd.go +++ b/pkg/registry/etcd/etcd.go @@ -604,7 +604,7 @@ func (r *Registry) GetMinion(ctx api.Context, minionID string) (*api.Node, error key := makeNodeKey(minionID) err := r.ExtractObj(key, &minion, false) if err != nil { - return nil, etcderr.InterpretGetError(err, "minion", minion.Name) + return nil, etcderr.InterpretGetError(err, "minion", minionID) } return &minion, nil } diff --git a/pkg/registry/minion/healthy_registry.go b/pkg/registry/minion/healthy_registry.go index b7d87e5b4d8..1e8878cf1a9 100644 --- a/pkg/registry/minion/healthy_registry.go +++ b/pkg/registry/minion/healthy_registry.go @@ -40,6 +40,9 @@ func NewHealthyRegistry(delegate Registry, client client.KubeletHealthChecker) R func (r *HealthyRegistry) GetMinion(ctx api.Context, minionID string) (*api.Node, error) { minion, err := r.delegate.GetMinion(ctx, minionID) + if err != nil { + return minion, err + } if minion == nil { return nil, ErrDoesNotExist } diff --git a/pkg/registry/minion/rest.go b/pkg/registry/minion/rest.go index 2ae642c4dba..50d98e89c27 100644 --- a/pkg/registry/minion/rest.go +++ b/pkg/registry/minion/rest.go @@ -86,6 +86,9 @@ func (rs *REST) Delete(ctx api.Context, id string) (<-chan apiserver.RESTResult, // Get satisfies the RESTStorage interface. func (rs *REST) Get(ctx api.Context, id string) (runtime.Object, error) { minion, err := rs.registry.GetMinion(ctx, id) + if err != nil { + return minion, err + } if minion == nil { return nil, ErrDoesNotExist }