refactor: Move versioned/watch to meta/v1

This commit is contained in:
Clayton Coleman
2017-01-04 15:14:42 -05:00
parent b7d03ed3d5
commit e5019de260
63 changed files with 700 additions and 469 deletions

View File

@@ -35,7 +35,6 @@ import (
"k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/runtime/schema"
"k8s.io/kubernetes/pkg/util/yaml"
"k8s.io/kubernetes/pkg/watch/versioned"
)
type thirdPartyObjectConverter struct {
@@ -535,9 +534,9 @@ func (t *thirdPartyResourceDataEncoder) Encode(obj runtime.Object, stream io.Wri
_, err = stream.Write(encBytes)
return err
case *versioned.InternalEvent:
event := &versioned.Event{}
err := versioned.Convert_versioned_InternalEvent_to_versioned_Event(obj, event, nil)
case *metav1.InternalEvent:
event := &metav1.Event{}
err := metav1.Convert_versioned_InternalEvent_to_versioned_Event(obj, event, nil)
if err != nil {
return err
}