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

The kind on this object was always WatchEvent
This commit is contained in:
Clayton Coleman
2017-01-05 15:10:34 -05:00
parent c5d755dbec
commit f07c6486ba
13 changed files with 34 additions and 32 deletions

View File

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

View File

@@ -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)},
}

View File

@@ -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)},
})
}