mirror of
https://github.com/k3s-io/kubernetes.git
synced 2026-01-06 07:57:35 +00:00
refactor: Move versioned/watch to meta/v1
This commit is contained in:
@@ -38,7 +38,6 @@ go_library(
|
||||
"//pkg/util/validation/field:go_default_library",
|
||||
"//pkg/util/yaml:go_default_library",
|
||||
"//pkg/watch:go_default_library",
|
||||
"//pkg/watch/versioned:go_default_library",
|
||||
],
|
||||
)
|
||||
|
||||
@@ -61,7 +60,6 @@ go_test(
|
||||
"//pkg/apis/meta/v1:go_default_library",
|
||||
"//pkg/runtime:go_default_library",
|
||||
"//pkg/runtime/schema:go_default_library",
|
||||
"//pkg/watch/versioned:go_default_library",
|
||||
],
|
||||
)
|
||||
|
||||
|
||||
@@ -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
|
||||
}
|
||||
|
||||
@@ -31,7 +31,6 @@ import (
|
||||
metav1 "k8s.io/kubernetes/pkg/apis/meta/v1"
|
||||
"k8s.io/kubernetes/pkg/runtime"
|
||||
"k8s.io/kubernetes/pkg/runtime/schema"
|
||||
"k8s.io/kubernetes/pkg/watch/versioned"
|
||||
)
|
||||
|
||||
type Foo struct {
|
||||
@@ -239,10 +238,10 @@ func TestEncodeToStreamForInternalEvent(t *testing.T) {
|
||||
Kind: "Foo",
|
||||
}, delegate: testapi.Extensions.Codec()}
|
||||
buf := bytes.NewBuffer([]byte{})
|
||||
expected := &versioned.Event{
|
||||
expected := &metav1.Event{
|
||||
Type: "Added",
|
||||
}
|
||||
err := e.Encode(&versioned.InternalEvent{
|
||||
err := e.Encode(&metav1.InternalEvent{
|
||||
Type: "Added",
|
||||
}, buf)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user