From 9ff765978a5aa2a6b627999e0c7cf4b302e523aa Mon Sep 17 00:00:00 2001 From: mqliang Date: Thu, 26 Nov 2015 15:32:54 +0800 Subject: [PATCH] add filedselector for Event --- pkg/api/v1/conversion.go | 3 ++- pkg/client/unversioned/request.go | 1 + pkg/registry/event/strategy.go | 1 + pkg/registry/event/strategy_test.go | 2 ++ 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/pkg/api/v1/conversion.go b/pkg/api/v1/conversion.go index 16b2a8c47b9..411f7704f30 100644 --- a/pkg/api/v1/conversion.go +++ b/pkg/api/v1/conversion.go @@ -112,7 +112,8 @@ func addConversionFuncs() { "involvedObject.resourceVersion", "involvedObject.fieldPath", "reason", - "source": + "source", + "type": return label, value, nil default: return "", "", fmt.Errorf("field label not supported: %s", label) diff --git a/pkg/client/unversioned/request.go b/pkg/client/unversioned/request.go index bc8478fe43c..1f313ea62bd 100644 --- a/pkg/client/unversioned/request.go +++ b/pkg/client/unversioned/request.go @@ -278,6 +278,7 @@ const ( EventReason = "reason" EventSource = "source" + EventType = "type" EventInvolvedKind = "involvedObject.kind" EventInvolvedNamespace = "involvedObject.namespace" EventInvolvedName = "involvedObject.name" diff --git a/pkg/registry/event/strategy.go b/pkg/registry/event/strategy.go index 800278b89cf..3617206064e 100644 --- a/pkg/registry/event/strategy.go +++ b/pkg/registry/event/strategy.go @@ -95,6 +95,7 @@ func getAttrs(obj runtime.Object) (objLabels labels.Set, objFields fields.Set, e "involvedObject.fieldPath": event.InvolvedObject.FieldPath, "reason": event.Reason, "source": event.Source.Component, + "type": event.Type, } return l, generic.MergeFieldsSets(objectMetaFieldsSet, specificFieldsSet), nil } diff --git a/pkg/registry/event/strategy_test.go b/pkg/registry/event/strategy_test.go index 7571ca71d53..da5eebd0314 100644 --- a/pkg/registry/event/strategy_test.go +++ b/pkg/registry/event/strategy_test.go @@ -57,6 +57,7 @@ func TestGetAttrs(t *testing.T) { }, Reason: "ForTesting", Source: api.EventSource{Component: "test"}, + Type: api.EventTypeNormal, } label, field, err := getAttrs(eventA) if err != nil { @@ -77,6 +78,7 @@ func TestGetAttrs(t *testing.T) { "involvedObject.fieldPath": "", "reason": "ForTesting", "source": "test", + "type": api.EventTypeNormal, } if e, a := expect, field; !reflect.DeepEqual(e, a) { t.Errorf("diff: %s", util.ObjectDiff(e, a))