github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor: Move versioned/watch to meta/v1

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/kubectl/cmd/BUILD
View File

@@ -203,7 +203,6 @@ go_test(
"//pkg/util/term:go_default_library",
"//pkg/util/wait:go_default_library",
"//pkg/watch:go_default_library",
"//pkg/watch/versioned:go_default_library",
"//vendor:github.com/spf13/cobra",
"//vendor:github.com/stretchr/testify/assert",
"//vendor:k8s.io/heapster/metrics/apis/metrics/v1alpha1",

3
pkg/kubectl/cmd/get_test.go
View File

@@ -40,7 +40,6 @@ import (
"k8s.io/kubernetes/pkg/runtime/serializer/json"
"k8s.io/kubernetes/pkg/runtime/serializer/streaming"
"k8s.io/kubernetes/pkg/watch"
"k8s.io/kubernetes/pkg/watch/versioned"
)
func testData() (*api.PodList, *api.ServiceList, *api.ReplicationControllerList) {
@@ -891,7 +890,7 @@ func TestWatchOnlyList(t *testing.T) {
func watchBody(codec runtime.Codec, events []watch.Event) io.ReadCloser {
buf := bytes.NewBuffer([]byte{})
enc := versioned.NewEncoder(streaming.NewEncoder(buf, codec), codec)
enc := metav1.NewEncoder(streaming.NewEncoder(buf, codec), codec)
for i := range events {
enc.Encode(&events[i])
}