From ab0e9f1d4165236058f3017f714954f93f09c08d Mon Sep 17 00:00:00 2001 From: Dawn Chen Date: Thu, 26 Mar 2015 10:00:10 -0700 Subject: [PATCH] Fixed an issue on searching events by a given fieldSelector. The issue break the events reported for kubectl describe pods completely. Fixed #5957 --- pkg/client/events.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkg/client/events.go b/pkg/client/events.go index 3ffd2bfb7b1..6aa0489ddfe 100644 --- a/pkg/client/events.go +++ b/pkg/client/events.go @@ -146,12 +146,17 @@ func (e *events) Search(objOrRef runtime.Object) (*api.EventList, error) { if e.namespace != "" && ref.Namespace != e.namespace { return nil, fmt.Errorf("won't be able to find any events of namespace '%v' in namespace '%v'", ref.Namespace, e.namespace) } + stringRefKind := string(ref.Kind) + var refKind *string + if stringRefKind != "" { + refKind = &stringRefKind + } stringRefUID := string(ref.UID) var refUID *string if stringRefUID != "" { refUID = &stringRefUID } - fieldSelector := e.GetFieldSelector(&ref.Name, &ref.Namespace, &ref.Kind, refUID) + fieldSelector := e.GetFieldSelector(&ref.Name, &ref.Namespace, refKind, refUID) return e.List(labels.Everything(), fieldSelector) }