From 688363ad53ae1f29b5e4f67bbb4b1b96e0238ad5 Mon Sep 17 00:00:00 2001 From: Dawn Chen Date: Thu, 26 Mar 2015 16:32:08 -0700 Subject: [PATCH] Kubectl describe nodes id with events. --- pkg/kubectl/describe.go | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkg/kubectl/describe.go b/pkg/kubectl/describe.go index d0a335987dc..0ef55369297 100644 --- a/pkg/kubectl/describe.go +++ b/pkg/kubectl/describe.go @@ -27,6 +27,7 @@ import ( "github.com/GoogleCloudPlatform/kubernetes/pkg/api" "github.com/GoogleCloudPlatform/kubernetes/pkg/client" "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" + "github.com/GoogleCloudPlatform/kubernetes/pkg/types" "github.com/golang/glog" ) @@ -366,7 +367,14 @@ func (d *NodeDescriber) Describe(namespace, name string) (string, error) { pods = append(pods, pod) } - events, _ := d.Events(namespace).Search(node) + var events *api.EventList + if ref, err := api.GetReference(node); err != nil { + glog.Errorf("Unable to construct reference to '%#v': %v", node, err) + } else { + // TODO: We haven't decided the namespace for Node object yet. + ref.UID = types.UID(ref.Name) + events, _ = d.Events("").Search(ref) + } return describeNode(node, pods, events) }