Rename metav1.Event to metav1.WatchEvent to avoid swagger collision

pkg/api/serialization_test.go

@@ -444,7 +444,7 @@ func TestObjectWatchFraming(t *testing.T) {
 		if err := embedded.Encode(v1secret, obj); err != nil {
 			t.Fatal(err)
 		}
-		event := &metav1.Event{Type: string(watch.Added)}
+		event := &metav1.WatchEvent{Type: string(watch.Added)}
 		event.Object.Raw = obj.Bytes()
 		obj = &bytes.Buffer{}
 		if err := s.Encode(event, obj); err != nil {
@@ -456,7 +456,7 @@ func TestObjectWatchFraming(t *testing.T) {
 			t.Fatal(err)
 		}
 		sr = streaming.NewDecoder(framer.NewFrameReader(ioutil.NopCloser(out)), s)
-		outEvent := &metav1.Event{}
+		outEvent := &metav1.WatchEvent{}
 		res, _, err = sr.Decode(nil, outEvent)
 		if err != nil || outEvent.Type != string(watch.Added) {
 			t.Fatalf("%v: %#v", err, outEvent)

pkg/api/v1/conversion.go

@@ -123,14 +123,14 @@ func addFastPathConversionFuncs(scheme *runtime.Scheme) error {
 				return true, Convert_api_Endpoints_To_v1_Endpoints(a, b, s)
 			}
 
-		case *metav1.Event:
+		case *metav1.WatchEvent:
 			switch b := objB.(type) {
 			case *metav1.InternalEvent:
 				return true, metav1.Convert_versioned_Event_to_versioned_InternalEvent(a, b, s)
 			}
 		case *metav1.InternalEvent:
 			switch b := objB.(type) {
-			case *metav1.Event:
+			case *metav1.WatchEvent:
 				return true, metav1.Convert_versioned_InternalEvent_to_versioned_Event(a, b, s)
 			}
 		}

pkg/apis/meta/v1/register.go

@@ -37,7 +37,7 @@ func Kind(kind string) schema.GroupKind {
 
 // AddToGroupVersion registers common meta types into schemas.
 func AddToGroupVersion(scheme *runtime.Scheme, groupVersion schema.GroupVersion) {
-	scheme.AddKnownTypeWithName(groupVersion.WithKind(WatchEventKind), &Event{})
+	scheme.AddKnownTypeWithName(groupVersion.WithKind(WatchEventKind), &WatchEvent{})
 	scheme.AddKnownTypeWithName(
 		schema.GroupVersion{Group: groupVersion.Group, Version: runtime.APIVersionInternal}.WithKind(WatchEventKind),
 		&InternalEvent{},

pkg/apis/meta/v1/watch.go

@@ -26,8 +26,7 @@ import (
 // Event represents a single event to a watched resource.
 //
 // +protobuf=true
-// +k8s:openapi-gen=false
-type Event struct {
+type WatchEvent struct {
 	Type string `json:"type" protobuf:"bytes,1,opt,name=type"`
 
 	// Object is:
@@ -38,7 +37,7 @@ type Event struct {
 	Object runtime.RawExtension `json:"object" protobuf:"bytes,2,opt,name=object"`
 }
 
-func Convert_watch_Event_to_versioned_Event(in *watch.Event, out *Event, s conversion.Scope) error {
+func Convert_watch_Event_to_versioned_Event(in *watch.Event, out *WatchEvent, s conversion.Scope) error {
 	out.Type = string(in.Type)
 	switch t := in.Object.(type) {
 	case *runtime.Unknown:
@@ -51,11 +50,11 @@ func Convert_watch_Event_to_versioned_Event(in *watch.Event, out *Event, s conve
 	return nil
 }
 
-func Convert_versioned_InternalEvent_to_versioned_Event(in *InternalEvent, out *Event, s conversion.Scope) error {
+func Convert_versioned_InternalEvent_to_versioned_Event(in *InternalEvent, out *WatchEvent, s conversion.Scope) error {
 	return Convert_watch_Event_to_versioned_Event((*watch.Event)(in), out, s)
 }
 
-func Convert_versioned_Event_to_watch_Event(in *Event, out *watch.Event, s conversion.Scope) error {
+func Convert_versioned_Event_to_watch_Event(in *WatchEvent, out *watch.Event, s conversion.Scope) error {
 	out.Type = watch.EventType(in.Type)
 	if in.Object.Object != nil {
 		out.Object = in.Object.Object
@@ -69,7 +68,7 @@ func Convert_versioned_Event_to_watch_Event(in *Event, out *watch.Event, s conve
 	return nil
 }
 
-func Convert_versioned_Event_to_versioned_InternalEvent(in *Event, out *InternalEvent, s conversion.Scope) error {
+func Convert_versioned_Event_to_versioned_InternalEvent(in *WatchEvent, out *InternalEvent, s conversion.Scope) error {
 	return Convert_versioned_Event_to_watch_Event(in, (*watch.Event)(out), s)
 }
 
@@ -78,4 +77,4 @@ func Convert_versioned_Event_to_versioned_InternalEvent(in *Event, out *Internal
 type InternalEvent watch.Event
 
 func (e *InternalEvent) GetObjectKind() schema.ObjectKind { return schema.EmptyObjectKind }
-func (e *Event) GetObjectKind() schema.ObjectKind         { return schema.EmptyObjectKind }
+func (e *WatchEvent) GetObjectKind() schema.ObjectKind    { return schema.EmptyObjectKind }

pkg/client/restclient/watch/decoder.go

@@ -45,7 +45,7 @@ func NewDecoder(decoder streaming.Decoder, embeddedDecoder runtime.Decoder) *Dec
 // Decode blocks until it can return the next object in the reader. Returns an error
 // if the reader is closed or an object can't be decoded.
 func (d *Decoder) Decode() (watch.EventType, runtime.Object, error) {
-	var got metav1.Event
+	var got metav1.WatchEvent
 	res, _, err := d.decoder.Decode(nil, &got)
 	if err != nil {
 		return "", nil, err

pkg/client/restclient/watch/decoder_test.go

@@ -47,7 +47,7 @@ func TestDecoder(t *testing.T) {
 			if err != nil {
 				t.Fatalf("Unexpected error %v", err)
 			}
-			event := metav1.Event{
+			event := metav1.WatchEvent{
 				Type:   string(eventType),
 				Object: runtime.RawExtension{Raw: json.RawMessage(data)},
 			}

pkg/client/restclient/watch/encoder.go

@@ -19,7 +19,7 @@ package versioned
 import (
 	"encoding/json"
 
-	"k8s.io/kubernetes/pkg/apis/meta/v1"
+	metav1 "k8s.io/kubernetes/pkg/apis/meta/v1"
 	"k8s.io/kubernetes/pkg/runtime"
 	"k8s.io/kubernetes/pkg/runtime/serializer/streaming"
 	"k8s.io/kubernetes/pkg/watch"
@@ -49,5 +49,8 @@ func (e *Encoder) Encode(event *watch.Event) error {
 		return err
 	}
 	// FIXME: get rid of json.RawMessage.
-	return e.encoder.Encode(&v1.Event{string(event.Type), runtime.RawExtension{Raw: json.RawMessage(data)}})
+	return e.encoder.Encode(&metav1.WatchEvent{
+		Type:   string(event.Type),
+		Object: runtime.RawExtension{Raw: json.RawMessage(data)},
+	})
 }

pkg/genericapiserver/api/watch_test.go

@@ -333,7 +333,7 @@ func TestWatchRead(t *testing.T) {
 				// Send
 				w.Action(action, object)
 				// Test receive
-				var got metav1.Event
+				var got metav1.WatchEvent
 				_, _, err := d.Decode(nil, &got)
 				if err != nil {
 					t.Fatalf("%s: Unexpected error: %v", name, err)
@@ -355,7 +355,7 @@ func TestWatchRead(t *testing.T) {
 			}
 			w.Stop()
 
-			var got metav1.Event
+			var got metav1.WatchEvent
 			_, _, err := d.Decode(nil, &got)
 			if err == nil {
 				t.Errorf("Unexpected non-error")

pkg/registry/extensions/thirdpartyresourcedata/codec.go

@@ -535,7 +535,7 @@ func (t *thirdPartyResourceDataEncoder) Encode(obj runtime.Object, stream io.Wri
 		_, err = stream.Write(encBytes)
 		return err
 	case *metav1.InternalEvent:
-		event := &metav1.Event{}
+		event := &metav1.WatchEvent{}
 		err := metav1.Convert_versioned_InternalEvent_to_versioned_Event(obj, event, nil)
 		if err != nil {
 			return err

pkg/registry/extensions/thirdpartyresourcedata/codec_test.go

@@ -238,7 +238,7 @@ func TestEncodeToStreamForInternalEvent(t *testing.T) {
 		Kind:    "Foo",
 	}, delegate: testapi.Extensions.Codec()}
 	buf := bytes.NewBuffer([]byte{})
-	expected := &metav1.Event{
+	expected := &metav1.WatchEvent{
 		Type: "Added",
 	}
 	err := e.Encode(&metav1.InternalEvent{

pkg/watch/filter_test.go

@@ -25,11 +25,11 @@ import (
 
 func TestFilter(t *testing.T) {
 	table := []Event{
-		{Added, testType("foo")},
-		{Added, testType("bar")},
-		{Added, testType("baz")},
-		{Added, testType("qux")},
-		{Added, testType("zoo")},
+		{Type: Added, Object: testType("foo")},
+		{Type: Added, Object: testType("bar")},
+		{Type: Added, Object: testType("baz")},
+		{Type: Added, Object: testType("qux")},
+		{Type: Added, Object: testType("zoo")},
 	}
 
 	source := NewFake()

pkg/watch/mux_test.go

@@ -36,10 +36,10 @@ func (obj *myType) GetObjectKind() schema.ObjectKind { return schema.EmptyObject
 
 func TestBroadcaster(t *testing.T) {
 	table := []Event{
-		{Added, &myType{"foo", "hello world 1"}},
-		{Added, &myType{"bar", "hello world 2"}},
-		{Modified, &myType{"foo", "goodbye world 3"}},
-		{Deleted, &myType{"bar", "hello world 4"}},
+		{Type: Added, Object: &myType{"foo", "hello world 1"}},
+		{Type: Added, Object: &myType{"bar", "hello world 2"}},
+		{Type: Modified, Object: &myType{"foo", "goodbye world 3"}},
+		{Type: Deleted, Object: &myType{"bar", "hello world 4"}},
 	}
 
 	// The broadcaster we're testing
@@ -124,8 +124,8 @@ func TestBroadcasterWatcherStopDeadlock(t *testing.T) {
 func TestBroadcasterDropIfChannelFull(t *testing.T) {
 	m := NewBroadcaster(1, DropIfChannelFull)
 
-	event1 := Event{Added, &myType{"foo", "hello world 1"}}
-	event2 := Event{Added, &myType{"bar", "hello world 2"}}
+	event1 := Event{Type: Added, Object: &myType{"foo", "hello world 1"}}
+	event2 := Event{Type: Added, Object: &myType{"bar", "hello world 2"}}
 
 	// Add a couple watchers
 	watches := make([]Interface, 2)

pkg/watch/streamwatcher_test.go

@@ -43,7 +43,7 @@ func (f fakeDecoder) Close() {
 
 func TestStreamWatcher(t *testing.T) {
 	table := []Event{
-		{Added, testType("foo")},
+		{Type: Added, Object: testType("foo")},
 	}
 
 	fd := fakeDecoder{make(chan Event, 5)}