Merge pull request #17817 from mqliang/eventtype

Auto commit by PR queue bot

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)

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"

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
 }

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))