Skip to content

K
k3s
Unverified Commit e5019de2 authored by Clayton Coleman's avatar Clayton Coleman
Browse files
Options

refactor: Move versioned/watch to meta/v1

parent b7d03ed3
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 204 additions and 142 deletions
cmd/kubernetes-discovery/pkg/apis/apiregistration/BUILD
View file @ e5019de2
......@@ -23,7 +23,6 @@ go_library(
"//pkg/conversion:go_default_library",
"//pkg/runtime:go_default_library",
"//pkg/runtime/schema:go_default_library",
"//pkg/watch/versioned:go_default_library",
],
)
......
cmd/kubernetes-discovery/pkg/apis/apiregistration/register.go
View file @ e5019de2
......@@ -21,7 +21,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"
)
const GroupName = "apiregistration.k8s.io"
......@@ -54,6 +53,6 @@ func addKnownTypes(scheme *runtime.Scheme) error {
&kapi.DeleteOptions{},
&metav1.GetOptions{},
)
versioned.AddToGroupVersion(scheme, SchemeGroupVersion)
metav1.AddToGroupVersion(scheme, SchemeGroupVersion)
return nil
}
cmd/kubernetes-discovery/pkg/apis/apiregistration/v1alpha1/BUILD
View file @ e5019de2
......@@ -26,7 +26,6 @@ go_library(
"//pkg/runtime:go_default_library",
"//pkg/runtime/schema:go_default_library",
"//pkg/types:go_default_library",
"//pkg/watch/versioned:go_default_library",
"//vendor:github.com/ugorji/go/codec",
],
)
......
cmd/kubernetes-discovery/pkg/apis/apiregistration/v1alpha1/register.go
View file @ e5019de2
......@@ -21,7 +21,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"
)
const GroupName = "apiregistration.k8s.io"
......@@ -44,6 +43,6 @@ func addKnownTypes(scheme *runtime.Scheme) error {
&v1.DeleteOptions{},
&metav1.GetOptions{},
)
versioned.AddToGroupVersion(scheme, SchemeGroupVersion)
metav1.AddToGroupVersion(scheme, SchemeGroupVersion)
return nil
}
cmd/libs/go2idl/client-gen/test_apis/testgroup/v1/BUILD
View file @ e5019de2
......@@ -22,7 +22,6 @@ go_library(
"//pkg/runtime:go_default_library",
"//pkg/runtime/schema:go_default_library",
"//pkg/types:go_default_library",
"//pkg/watch/versioned:go_default_library",
"//vendor:github.com/ugorji/go/codec",
],
)
......
cmd/libs/go2idl/client-gen/test_apis/testgroup/v1/register.go
View file @ e5019de2
......@@ -21,7 +21,6 @@ import (
metav1 "k8s.io/kubernetes/pkg/apis/meta/v1"
"k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/runtime/schema"
versionedwatch "k8s.io/kubernetes/pkg/watch/versioned"
)
var SchemeGroupVersion = schema.GroupVersion{Group: "testgroup.k8s.io", Version: "v1"}
......@@ -44,7 +43,7 @@ func addKnownTypes(scheme *runtime.Scheme) error {
&metav1.Status{},
&metav1.ExportOptions{},
)
versionedwatch.AddToGroupVersion(scheme, SchemeGroupVersion)
metav1.AddToGroupVersion(scheme, SchemeGroupVersion)
return nil
}
......
federation/apis/core/v1/BUILD
View file @ e5019de2
......@@ -22,7 +22,6 @@ go_library(
"//pkg/apis/meta/v1:go_default_library",
"//pkg/runtime:go_default_library",
"//pkg/runtime/schema:go_default_library",
"//pkg/watch/versioned:go_default_library",
],
)
......
federation/apis/core/v1/register.go
View file @ e5019de2
......@@ -21,7 +21,6 @@ import (
metav1 "k8s.io/kubernetes/pkg/apis/meta/v1"
"k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/runtime/schema"
versionedwatch "k8s.io/kubernetes/pkg/watch/versioned"
)
// GroupName is the group name use in this package
......@@ -56,6 +55,6 @@ func addKnownTypes(scheme *runtime.Scheme) error {
scheme.AddKnownTypes(SchemeGroupVersion, &metav1.Status{})
// Add the watch version that applies
versionedwatch.AddToGroupVersion(scheme, SchemeGroupVersion)
metav1.AddToGroupVersion(scheme, SchemeGroupVersion)
return nil
}
federation/apis/federation/v1beta1/BUILD
View file @ e5019de2
......@@ -32,7 +32,6 @@ go_library(
"//pkg/runtime:go_default_library",
"//pkg/runtime/schema:go_default_library",
"//pkg/types:go_default_library",
"//pkg/watch/versioned:go_default_library",
"//vendor:github.com/gogo/protobuf/proto",
"//vendor:github.com/ugorji/go/codec",
],
......
federation/apis/federation/v1beta1/register.go
View file @ e5019de2
......@@ -21,7 +21,6 @@ import (
metav1 "k8s.io/kubernetes/pkg/apis/meta/v1"
"k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/runtime/schema"
versionedwatch "k8s.io/kubernetes/pkg/watch/versioned"
)
// GroupName is the group name use in this package
......@@ -44,7 +43,7 @@ func addKnownTypes(scheme *runtime.Scheme) error {
&metav1.ExportOptions{},
&metav1.GetOptions{},
)
versionedwatch.AddToGroupVersion(scheme, SchemeGroupVersion)
metav1.AddToGroupVersion(scheme, SchemeGroupVersion)
return nil
}
......
pkg/api/BUILD
View file @ e5019de2
......@@ -102,7 +102,6 @@ go_test(
"//pkg/util/sets:go_default_library",
"//pkg/util/uuid:go_default_library",
"//pkg/watch:go_default_library",
"//pkg/watch/versioned:go_default_library",
"//vendor:github.com/davecgh/go-spew/spew",
"//vendor:github.com/gogo/protobuf/proto",
"//vendor:github.com/golang/protobuf/proto",
......
pkg/api/serialization_test.go
View file @ e5019de2
......@@ -47,7 +47,6 @@ import (
"k8s.io/kubernetes/pkg/util/diff"
"k8s.io/kubernetes/pkg/util/sets"
"k8s.io/kubernetes/pkg/watch"
"k8s.io/kubernetes/pkg/watch/versioned"
)
var fuzzIters = flag.Int("fuzz-iters", 20, "How many fuzzing iterations to do.")
......@@ -445,7 +444,7 @@ func TestObjectWatchFraming(t *testing.T) {
if err := embedded.Encode(v1secret, obj); err != nil {
t.Fatal(err)
}
event := &versioned.Event{Type: string(watch.Added)}
event := &metav1.Event{Type: string(watch.Added)}
event.Object.Raw = obj.Bytes()
obj = &bytes.Buffer{}
if err := s.Encode(event, obj); err != nil {
......@@ -457,7 +456,7 @@ func TestObjectWatchFraming(t *testing.T) {
t.Fatal(err)
}
sr = streaming.NewDecoder(framer.NewFrameReader(ioutil.NopCloser(out)), s)
outEvent := &versioned.Event{}
outEvent := &metav1.Event{}
res, _, err = sr.Decode(nil, outEvent)
if err != nil || outEvent.Type != string(watch.Added) {
t.Fatalf("%v: %#v", err, outEvent)
......
pkg/api/v1/BUILD
View file @ e5019de2
......@@ -48,7 +48,6 @@ go_library(
"//pkg/util/rand:go_default_library",
"//pkg/util/sets:go_default_library",
"//pkg/util/validation/field:go_default_library",
"//pkg/watch/versioned:go_default_library",
"//vendor:github.com/gogo/protobuf/proto",
"//vendor:github.com/gogo/protobuf/sortkeys",
"//vendor:github.com/ugorji/go/codec",
......
pkg/api/v1/conversion.go
View file @ e5019de2
......@@ -23,10 +23,10 @@ import (
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/apis/extensions"
metav1 "k8s.io/kubernetes/pkg/apis/meta/v1"
"k8s.io/kubernetes/pkg/conversion"
"k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/util/validation/field"
"k8s.io/kubernetes/pkg/watch/versioned"
)
const (
......@@ -123,15 +123,15 @@ func addFastPathConversionFuncs(scheme *runtime.Scheme) error {
return true, Convert_api_Endpoints_To_v1_Endpoints(a, b, s)
}
case *versioned.Event:
case *metav1.Event:
switch b := objB.(type) {
case *versioned.InternalEvent:
return true, versioned.Convert_versioned_Event_to_versioned_InternalEvent(a, b, s)
case *metav1.InternalEvent:
return true, metav1.Convert_versioned_Event_to_versioned_InternalEvent(a, b, s)
}
case *versioned.InternalEvent:
case *metav1.InternalEvent:
switch b := objB.(type) {
case *versioned.Event:
return true, versioned.Convert_versioned_InternalEvent_to_versioned_Event(a, b, s)
case *metav1.Event:
return true, metav1.Convert_versioned_InternalEvent_to_versioned_Event(a, b, s)
}
}
return false, nil
......
pkg/api/v1/conversion_test.go
View file @ e5019de2
......@@ -36,7 +36,7 @@ func TestPodLogOptions(t *testing.T) {
tailLines := int64(2)
limitBytes := int64(3)
versionedLogOptions := &versioned.PodLogOptions{
versionedLogOptions := &metav1.PodLogOptions{
Container: "mycontainer",
Follow: true,
Previous: true,
......@@ -71,7 +71,7 @@ func TestPodLogOptions(t *testing.T) {
// unversioned -> query params
{
actualParameters, err := codec.EncodeParameters(unversionedLogOptions, versioned.SchemeGroupVersion)
actualParameters, err := codec.EncodeParameters(unversionedLogOptions, metav1.SchemeGroupVersion)
if err != nil {
t.Fatal(err)
}
......@@ -82,7 +82,7 @@ func TestPodLogOptions(t *testing.T) {
// versioned -> query params
{
actualParameters, err := codec.EncodeParameters(versionedLogOptions, versioned.SchemeGroupVersion)
actualParameters, err := codec.EncodeParameters(versionedLogOptions, metav1.SchemeGroupVersion)
if err != nil {
t.Fatal(err)
}
......@@ -93,8 +93,8 @@ func TestPodLogOptions(t *testing.T) {
// query params -> versioned
{
convertedLogOptions := &versioned.PodLogOptions{}
err := codec.DecodeParameters(expectedParameters, versioned.SchemeGroupVersion, convertedLogOptions)
convertedLogOptions := &metav1.PodLogOptions{}
err := codec.DecodeParameters(expectedParameters, metav1.SchemeGroupVersion, convertedLogOptions)
if err != nil {
t.Fatal(err)
}
......@@ -106,7 +106,7 @@ func TestPodLogOptions(t *testing.T) {
// query params -> unversioned
{
convertedLogOptions := &api.PodLogOptions{}
err := codec.DecodeParameters(expectedParameters, versioned.SchemeGroupVersion, convertedLogOptions)
err := codec.DecodeParameters(expectedParameters, metav1.SchemeGroupVersion, convertedLogOptions)
if err != nil {
t.Fatal(err)
}
......@@ -126,7 +126,7 @@ func TestPodSpecConversion(t *testing.T) {
i := &api.PodSpec{
ServiceAccountName: name,
}
v := versioned.PodSpec{}
v := metav1.PodSpec{}
if err := api.Scheme.Convert(i, &v, nil); err != nil {
t.Fatalf("unexpected error: %v", err)
}
......@@ -140,7 +140,7 @@ func TestPodSpecConversion(t *testing.T) {
// Test v1 -> internal. Either DeprecatedServiceAccount, ServiceAccountName,
// or both should translate to ServiceAccountName. ServiceAccountName wins
// if both are set.
testCases := []*versioned.PodSpec{
testCases := []*metav1.PodSpec{
// New
{ServiceAccountName: name},
// Alias
......@@ -167,14 +167,14 @@ func TestResourceListConversion(t *testing.T) {
bigMilliQuantity.Add(resource.MustParse("12345m"))
tests := []struct {
input versioned.ResourceList
input metav1.ResourceList
expected api.ResourceList
}{
{ // No changes necessary.
input: versioned.ResourceList{
versioned.ResourceMemory: resource.MustParse("30M"),
versioned.ResourceCPU: resource.MustParse("100m"),
versioned.ResourceStorage: resource.MustParse("1G"),
input: metav1.ResourceList{
metav1.ResourceMemory: resource.MustParse("30M"),
metav1.ResourceCPU: resource.MustParse("100m"),
metav1.ResourceStorage: resource.MustParse("1G"),
},
expected: api.ResourceList{
api.ResourceMemory: resource.MustParse("30M"),
......@@ -183,9 +183,9 @@ func TestResourceListConversion(t *testing.T) {
},
},
{ // Nano-scale values should be rounded up to milli-scale.
input: versioned.ResourceList{
versioned.ResourceCPU: resource.MustParse("3.000023m"),
versioned.ResourceMemory: resource.MustParse("500.000050m"),
input: metav1.ResourceList{
metav1.ResourceCPU: resource.MustParse("3.000023m"),
metav1.ResourceMemory: resource.MustParse("500.000050m"),
},
expected: api.ResourceList{
api.ResourceCPU: resource.MustParse("4m"),
......@@ -193,9 +193,9 @@ func TestResourceListConversion(t *testing.T) {
},
},
{ // Large values should still be accurate.
input: versioned.ResourceList{
versioned.ResourceCPU: *bigMilliQuantity.Copy(),
versioned.ResourceStorage: *bigMilliQuantity.Copy(),
input: metav1.ResourceList{
metav1.ResourceCPU: *bigMilliQuantity.Copy(),
metav1.ResourceStorage: *bigMilliQuantity.Copy(),
},
expected: api.ResourceList{
api.ResourceCPU: *bigMilliQuantity.Copy(),
......
pkg/api/v1/register.go
View file @ e5019de2
......@@ -20,7 +20,6 @@ import (
metav1 "k8s.io/kubernetes/pkg/apis/meta/v1"
"k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/runtime/schema"
versionedwatch "k8s.io/kubernetes/pkg/watch/versioned"
)
// GroupName is the group name use in this package
......@@ -95,6 +94,6 @@ func addKnownTypes(scheme *runtime.Scheme) error {
scheme.AddKnownTypes(SchemeGroupVersion, &metav1.Status{})
// Add the watch version that applies
versionedwatch.AddToGroupVersion(scheme, SchemeGroupVersion)
metav1.AddToGroupVersion(scheme, SchemeGroupVersion)
return nil
}
pkg/apis/apps/v1beta1/BUILD
View file @ e5019de2
......@@ -34,7 +34,6 @@ go_library(
"//pkg/runtime/schema:go_default_library",
"//pkg/types:go_default_library",
"//pkg/util/intstr:go_default_library",
"//pkg/watch/versioned:go_default_library",
"//vendor:github.com/gogo/protobuf/proto",
"//vendor:github.com/ugorji/go/codec",
],
......
pkg/apis/apps/v1beta1/register.go
View file @ e5019de2
......@@ -21,7 +21,6 @@ import (
metav1 "k8s.io/kubernetes/pkg/apis/meta/v1"
"k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/runtime/schema"
versionedwatch "k8s.io/kubernetes/pkg/watch/versioned"
)
// GroupName is the group name use in this package
......@@ -50,7 +49,7 @@ func addKnownTypes(scheme *runtime.Scheme) error {
&metav1.ExportOptions{},
&metav1.GetOptions{},
)
versionedwatch.AddToGroupVersion(scheme, SchemeGroupVersion)
metav1.AddToGroupVersion(scheme, SchemeGroupVersion)
return nil
}
......
pkg/apis/authorization/v1beta1/BUILD
View file @ e5019de2
......@@ -31,7 +31,6 @@ go_library(
"//pkg/runtime:go_default_library",
"//pkg/runtime/schema:go_default_library",
"//pkg/types:go_default_library",
"//pkg/watch/versioned:go_default_library",
"//vendor:github.com/gogo/protobuf/proto",
"//vendor:github.com/gogo/protobuf/sortkeys",
"//vendor:github.com/ugorji/go/codec",
......
pkg/apis/authorization/v1beta1/register.go
View file @ e5019de2
......@@ -21,7 +21,6 @@ import (
metav1 "k8s.io/kubernetes/pkg/apis/meta/v1"
"k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/runtime/schema"
versionedwatch "k8s.io/kubernetes/pkg/watch/versioned"
)
// GroupName is the group name use in this package
......@@ -53,7 +52,7 @@ func addKnownTypes(scheme *runtime.Scheme) error {
&LocalSubjectAccessReview{},
)
versionedwatch.AddToGroupVersion(scheme, SchemeGroupVersion)
metav1.AddToGroupVersion(scheme, SchemeGroupVersion)
return nil
}
......
pkg/apis/autoscaling/v1/BUILD
View file @ e5019de2
......@@ -31,7 +31,6 @@ go_library(
"//pkg/runtime:go_default_library",
"//pkg/runtime/schema:go_default_library",
"//pkg/types:go_default_library",
"//pkg/watch/versioned:go_default_library",
"//vendor:github.com/gogo/protobuf/proto",
"//vendor:github.com/ugorji/go/codec",
],
......
pkg/apis/autoscaling/v1/register.go
View file @ e5019de2
......@@ -21,7 +21,6 @@ import (
metav1 "k8s.io/kubernetes/pkg/apis/meta/v1"
"k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/runtime/schema"
versionedwatch "k8s.io/kubernetes/pkg/watch/versioned"
)
// GroupName is the group name use in this package
......@@ -51,6 +50,6 @@ func addKnownTypes(scheme *runtime.Scheme) error {
&metav1.ExportOptions{},
&metav1.GetOptions{},
)
versionedwatch.AddToGroupVersion(scheme, SchemeGroupVersion)
metav1.AddToGroupVersion(scheme, SchemeGroupVersion)
return nil
}
pkg/apis/batch/v1/BUILD
View file @ e5019de2
......@@ -35,7 +35,6 @@ go_library(
"//pkg/runtime/schema:go_default_library",
"//pkg/types:go_default_library",
"//pkg/util/intstr:go_default_library",
"//pkg/watch/versioned:go_default_library",
"//vendor:github.com/gogo/protobuf/proto",
"//vendor:github.com/ugorji/go/codec",
],
......
pkg/apis/batch/v1/register.go
View file @ e5019de2
......@@ -21,7 +21,6 @@ import (
metav1 "k8s.io/kubernetes/pkg/apis/meta/v1"
"k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/runtime/schema"
versionedwatch "k8s.io/kubernetes/pkg/watch/versioned"
)
// GroupName is the group name use in this package
......@@ -50,6 +49,6 @@ func addKnownTypes(scheme *runtime.Scheme) error {
&metav1.ExportOptions{},
&metav1.GetOptions{},
)
versionedwatch.AddToGroupVersion(scheme, SchemeGroupVersion)
metav1.AddToGroupVersion(scheme, SchemeGroupVersion)
return nil
}
pkg/apis/batch/v2alpha1/BUILD
View file @ e5019de2
......@@ -35,7 +35,6 @@ go_library(
"//pkg/runtime/schema:go_default_library",
"//pkg/types:go_default_library",
"//pkg/util/intstr:go_default_library",
"//pkg/watch/versioned:go_default_library",
"//vendor:github.com/gogo/protobuf/proto",
"//vendor:github.com/ugorji/go/codec",
],
......
pkg/apis/batch/v2alpha1/register.go
View file @ e5019de2
......@@ -21,7 +21,6 @@ import (
metav1 "k8s.io/kubernetes/pkg/apis/meta/v1"
"k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/runtime/schema"
versionedwatch "k8s.io/kubernetes/pkg/watch/versioned"
)
// GroupName is the group name use in this package
......@@ -55,6 +54,6 @@ func addKnownTypes(scheme *runtime.Scheme) error {
)
scheme.AddKnownTypeWithName(SchemeGroupVersion.WithKind("ScheduledJob"), &CronJob{})
scheme.AddKnownTypeWithName(SchemeGroupVersion.WithKind("ScheduledJobList"), &CronJobList{})
versionedwatch.AddToGroupVersion(scheme, SchemeGroupVersion)
metav1.AddToGroupVersion(scheme, SchemeGroupVersion)
return nil
}
pkg/apis/certificates/v1alpha1/BUILD
View file @ e5019de2
......@@ -31,7 +31,6 @@ go_library(
"//pkg/runtime:go_default_library",
"//pkg/runtime/schema:go_default_library",
"//pkg/types:go_default_library",
"//pkg/watch/versioned:go_default_library",
"//vendor:github.com/gogo/protobuf/proto",
"//vendor:github.com/ugorji/go/codec",
],
......
pkg/apis/certificates/v1alpha1/register.go
View file @ e5019de2
......@@ -21,7 +21,6 @@ import (
metav1 "k8s.io/kubernetes/pkg/apis/meta/v1"
"k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/runtime/schema"
versionedwatch "k8s.io/kubernetes/pkg/watch/versioned"
)
// GroupName is the group name use in this package
......@@ -57,7 +56,7 @@ func addKnownTypes(scheme *runtime.Scheme) error {
)
// Add the watch version that applies
versionedwatch.AddToGroupVersion(scheme, SchemeGroupVersion)
metav1.AddToGroupVersion(scheme, SchemeGroupVersion)
return nil
}
......
pkg/apis/extensions/v1beta1/BUILD
View file @ e5019de2
......@@ -36,7 +36,6 @@ go_library(
"//pkg/runtime/schema:go_default_library",
"//pkg/types:go_default_library",
"//pkg/util/intstr:go_default_library",
"//pkg/watch/versioned:go_default_library",
"//vendor:github.com/gogo/protobuf/proto",
"//vendor:github.com/gogo/protobuf/sortkeys",
"//vendor:github.com/ugorji/go/codec",
......
pkg/apis/extensions/v1beta1/register.go
View file @ e5019de2
......@@ -21,7 +21,6 @@ import (
metav1 "k8s.io/kubernetes/pkg/apis/meta/v1"
"k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/runtime/schema"
versionedwatch "k8s.io/kubernetes/pkg/watch/versioned"
)
// GroupName is the group name use in this package
......@@ -70,6 +69,6 @@ func addKnownTypes(scheme *runtime.Scheme) error {
&NetworkPolicyList{},
)
// Add the watch version that applies
versionedwatch.AddToGroupVersion(scheme, SchemeGroupVersion)
metav1.AddToGroupVersion(scheme, SchemeGroupVersion)
return nil
}
pkg/apis/imagepolicy/register.go
View file @ e5019de2
......@@ -53,6 +53,6 @@ func addKnownTypes(scheme *runtime.Scheme) error {
&ImageReview{},
)
// versioned.AddToGroupVersion(scheme, SchemeGroupVersion)
// metav1.AddToGroupVersion(scheme, SchemeGroupVersion)
return nil
}
pkg/apis/meta/v1/BUILD
View file @ e5019de2
......@@ -22,6 +22,7 @@ go_library(
"time_proto.go",
"types.go",
"types_swagger_doc_generated.go",
"watch.go",
"well_known_labels.go",
"zz_generated.deepcopy.go",
"zz_generated.defaults.go",
......@@ -35,6 +36,7 @@ go_library(
"//pkg/runtime/schema:go_default_library",
"//pkg/selection:go_default_library",
"//pkg/types:go_default_library",
"//pkg/watch:go_default_library",
"//vendor:github.com/go-openapi/spec",
"//vendor:github.com/gogo/protobuf/proto",
"//vendor:github.com/gogo/protobuf/sortkeys",
......
pkg/apis/meta/v1/generated.proto
View file @ e5019de2
......@@ -111,6 +111,21 @@ message Duration {
optional int64 duration = 1;
}
// Event represents a single event to a watched resource.
//
// +protobuf=true
// +k8s:openapi-gen=false
message Event {
optional string type = 1;
// Object is:
// * If Type is Added or Modified: the new state of the object.
// * If Type is Deleted: the state of the object immediately before deletion.
// * If Type is Error: *Status is recommended; other types may make sense
// depending on context.
optional k8s.io.kubernetes.pkg.runtime.RawExtension object = 2;
}
// ExportOptions is the query options to the standard REST get call.
message ExportOptions {
// Should this value be exported. Export strips fields that a user can not specify.
......
pkg/apis/meta/v1/zz_generated.deepcopy.go
View file @ e5019de2
......@@ -22,6 +22,7 @@ package v1
import (
conversion "k8s.io/kubernetes/pkg/conversion"
runtime "k8s.io/kubernetes/pkg/runtime"
reflect "reflect"
)
......@@ -34,6 +35,7 @@ func GetGeneratedDeepCopyFuncs() []conversion.GeneratedDeepCopyFunc {
{Fn: DeepCopy_v1_APIResourceList, InType: reflect.TypeOf(&APIResourceList{})},
{Fn: DeepCopy_v1_APIVersions, InType: reflect.TypeOf(&APIVersions{})},
{Fn: DeepCopy_v1_Duration, InType: reflect.TypeOf(&Duration{})},
{Fn: DeepCopy_v1_Event, InType: reflect.TypeOf(&Event{})},
{Fn: DeepCopy_v1_ExportOptions, InType: reflect.TypeOf(&ExportOptions{})},
{Fn: DeepCopy_v1_GetOptions, InType: reflect.TypeOf(&GetOptions{})},
{Fn: DeepCopy_v1_GroupKind, InType: reflect.TypeOf(&GroupKind{})},
......@@ -42,6 +44,7 @@ func GetGeneratedDeepCopyFuncs() []conversion.GeneratedDeepCopyFunc {
{Fn: DeepCopy_v1_GroupVersionForDiscovery, InType: reflect.TypeOf(&GroupVersionForDiscovery{})},
{Fn: DeepCopy_v1_GroupVersionKind, InType: reflect.TypeOf(&GroupVersionKind{})},
{Fn: DeepCopy_v1_GroupVersionResource, InType: reflect.TypeOf(&GroupVersionResource{})},
{Fn: DeepCopy_v1_InternalEvent, InType: reflect.TypeOf(&InternalEvent{})},
{Fn: DeepCopy_v1_LabelSelector, InType: reflect.TypeOf(&LabelSelector{})},
{Fn: DeepCopy_v1_LabelSelectorRequirement, InType: reflect.TypeOf(&LabelSelectorRequirement{})},
{Fn: DeepCopy_v1_ListMeta, InType: reflect.TypeOf(&ListMeta{})},
......@@ -161,6 +164,18 @@ func DeepCopy_v1_Duration(in interface{}, out interface{}, c *conversion.Cloner)
}
}
func DeepCopy_v1_Event(in interface{}, out interface{}, c *conversion.Cloner) error {
{
in := in.(*Event)
out := out.(*Event)
*out = *in
if err := runtime.DeepCopy_runtime_RawExtension(&in.Object, &out.Object, c); err != nil {
return err
}
return nil
}
}
func DeepCopy_v1_ExportOptions(in interface{}, out interface{}, c *conversion.Cloner) error {
{
in := in.(*ExportOptions)
......@@ -233,6 +248,23 @@ func DeepCopy_v1_GroupVersionResource(in interface{}, out interface{}, c *conver
}
}
func DeepCopy_v1_InternalEvent(in interface{}, out interface{}, c *conversion.Cloner) error {
{
in := in.(*InternalEvent)
out := out.(*InternalEvent)
*out = *in
// in.Object is kind 'Interface'
if in.Object != nil {
if newVal, err := c.DeepCopy(&in.Object); err != nil {
return err
} else {
out.Object = *newVal.(*runtime.Object)
}
}
return nil
}
}
func DeepCopy_v1_LabelSelector(in interface{}, out interface{}, c *conversion.Cloner) error {
{
in := in.(*LabelSelector)
......
pkg/apis/policy/v1alpha1/BUILD
View file @ e5019de2
......@@ -21,7 +21,6 @@ go_library(
"//pkg/runtime:go_default_library",
"//pkg/runtime/schema:go_default_library",
"//pkg/util/intstr:go_default_library",
"//pkg/watch/versioned:go_default_library",
],
)
......
pkg/apis/policy/v1alpha1/register.go
View file @ e5019de2
......@@ -21,7 +21,6 @@ import (
metav1 "k8s.io/kubernetes/pkg/apis/meta/v1"
"k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/runtime/schema"
versionedwatch "k8s.io/kubernetes/pkg/watch/versioned"
)
// GroupName is the group name use in this package
......@@ -52,6 +51,6 @@ func addKnownTypes(scheme *runtime.Scheme) error {
&metav1.GetOptions{},
)
// Add the watch version that applies
versionedwatch.AddToGroupVersion(scheme, SchemeGroupVersion)
metav1.AddToGroupVersion(scheme, SchemeGroupVersion)
return nil
}
pkg/apis/policy/v1beta1/BUILD
View file @ e5019de2
......@@ -30,7 +30,6 @@ go_library(
"//pkg/runtime/schema:go_default_library",
"//pkg/types:go_default_library",
"//pkg/util/intstr:go_default_library",
"//pkg/watch/versioned:go_default_library",
"//vendor:github.com/gogo/protobuf/proto",
"//vendor:github.com/gogo/protobuf/sortkeys",
"//vendor:github.com/ugorji/go/codec",
......
pkg/apis/policy/v1beta1/register.go
View file @ e5019de2
......@@ -21,7 +21,6 @@ import (
metav1 "k8s.io/kubernetes/pkg/apis/meta/v1"
"k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/runtime/schema"
versionedwatch "k8s.io/kubernetes/pkg/watch/versioned"
)
// GroupName is the group name use in this package
......@@ -52,6 +51,6 @@ func addKnownTypes(scheme *runtime.Scheme) error {
&metav1.GetOptions{},
)
// Add the watch version that applies
versionedwatch.AddToGroupVersion(scheme, SchemeGroupVersion)
metav1.AddToGroupVersion(scheme, SchemeGroupVersion)
return nil
}
pkg/apis/rbac/BUILD
View file @ e5019de2
......@@ -24,7 +24,6 @@ go_library(
"//pkg/runtime:go_default_library",
"//pkg/runtime/schema:go_default_library",
"//pkg/util/sets:go_default_library",
"//pkg/watch/versioned:go_default_library",
],
)
......
pkg/apis/rbac/register.go
View file @ e5019de2
......@@ -21,7 +21,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"
)
const GroupName = "rbac.authorization.k8s.io"
......@@ -62,6 +61,6 @@ func addKnownTypes(scheme *runtime.Scheme) error {
&metav1.ExportOptions{},
&metav1.GetOptions{},
)
versioned.AddToGroupVersion(scheme, SchemeGroupVersion)
metav1.AddToGroupVersion(scheme, SchemeGroupVersion)
return nil
}
pkg/apis/rbac/v1alpha1/BUILD
View file @ e5019de2
......@@ -33,7 +33,6 @@ go_library(
"//pkg/runtime:go_default_library",
"//pkg/runtime/schema:go_default_library",
"//pkg/types:go_default_library",
"//pkg/watch/versioned:go_default_library",
"//vendor:github.com/gogo/protobuf/proto",
"//vendor:github.com/ugorji/go/codec",
"//vendor:k8s.io/apiserver/pkg/authentication/user",
......
pkg/apis/rbac/v1alpha1/register.go
View file @ e5019de2
......@@ -21,7 +21,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"
)
const GroupName = "rbac.authorization.k8s.io"
......@@ -57,6 +56,6 @@ func addKnownTypes(scheme *runtime.Scheme) error {
&metav1.ExportOptions{},
&metav1.GetOptions{},
)
versioned.AddToGroupVersion(scheme, SchemeGroupVersion)
metav1.AddToGroupVersion(scheme, SchemeGroupVersion)
return nil
}
pkg/apis/storage/v1beta1/BUILD
View file @ e5019de2
......@@ -29,7 +29,6 @@ go_library(
"//pkg/runtime:go_default_library",
"//pkg/runtime/schema:go_default_library",
"//pkg/types:go_default_library",
"//pkg/watch/versioned:go_default_library",
"//vendor:github.com/gogo/protobuf/proto",
"//vendor:github.com/gogo/protobuf/sortkeys",
"//vendor:github.com/ugorji/go/codec",
......
pkg/apis/storage/v1beta1/register.go
View file @ e5019de2
......@@ -21,7 +21,6 @@ import (
metav1 "k8s.io/kubernetes/pkg/apis/meta/v1"
"k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/runtime/schema"
versionedwatch "k8s.io/kubernetes/pkg/watch/versioned"
)
// GroupName is the group name use in this package
......@@ -52,6 +51,6 @@ func addKnownTypes(scheme *runtime.Scheme) error {
&StorageClassList{},
)
versionedwatch.AddToGroupVersion(scheme, SchemeGroupVersion)
metav1.AddToGroupVersion(scheme, SchemeGroupVersion)
return nil
}
pkg/client/restclient/BUILD
View file @ e5019de2
......@@ -28,6 +28,7 @@ go_library(
"//pkg/api/validation/path:go_default_library",
"//pkg/apis/meta/v1:go_default_library",
"//pkg/client/metrics:go_default_library",
"//pkg/client/restclient/watch:go_default_library",
"//pkg/client/transport:go_default_library",
"//pkg/client/unversioned/clientcmd/api:go_default_library",
"//pkg/fields:go_default_library",
......@@ -41,7 +42,6 @@ go_library(
"//pkg/util/sets:go_default_library",
"//pkg/version:go_default_library",
"//pkg/watch:go_default_library",
"//pkg/watch/versioned:go_default_library",
"//vendor:github.com/golang/glog",
],
)
......@@ -77,7 +77,6 @@ go_test(
"//pkg/util/intstr:go_default_library",
"//pkg/util/testing:go_default_library",
"//pkg/watch:go_default_library",
"//pkg/watch/versioned:go_default_library",
"//vendor:github.com/google/gofuzz",
],
)
......
pkg/client/restclient/watch/BUILD 0 → 100644
View file @ e5019de2
package(default_visibility = ["//visibility:public"])
licenses(["notice"])
load(
"@io_bazel_rules_go//go:def.bzl",
"go_library",
"go_test",
)
go_library(
name = "go_default_library",
srcs = [
"decoder.go",
"encoder.go",
],
tags = ["automanaged"],
deps = [
"//pkg/apis/meta/v1:go_default_library",
"//pkg/runtime:go_default_library",
"//pkg/runtime/serializer/streaming:go_default_library",
"//pkg/watch:go_default_library",
],
)
go_test(
name = "go_default_xtest",
srcs = [
"decoder_test.go",
"encoder_test.go",
],
tags = ["automanaged"],
deps = [
"//pkg/api:go_default_library",
"//pkg/api/testapi:go_default_library",
"//pkg/apis/meta/v1:go_default_library",
"//pkg/runtime:go_default_library",
"//pkg/runtime/serializer/streaming:go_default_library",
"//pkg/util/wait:go_default_library",
"//pkg/watch:go_default_library",
],
)
pkg/client/typed/dynamic/BUILD
View file @ e5019de2
......@@ -50,7 +50,6 @@ go_test(
"//pkg/runtime/schema:go_default_library",
"//pkg/runtime/serializer/streaming:go_default_library",
"//pkg/watch:go_default_library",
"//pkg/watch/versioned:go_default_library",
],
)
......
pkg/client/typed/dynamic/client_test.go
View file @ e5019de2
......@@ -34,7 +34,6 @@ import (
"k8s.io/kubernetes/pkg/runtime/schema"
"k8s.io/kubernetes/pkg/runtime/serializer/streaming"
"k8s.io/kubernetes/pkg/watch"
"k8s.io/kubernetes/pkg/watch/versioned"
)
func getJSON(version, kind, name string) []byte {
......@@ -459,7 +458,7 @@ func TestWatch(t *testing.T) {
t.Errorf("Watch(%q) got path %s. wanted %s", tc.name, r.URL.Path, tc.path)
}
enc := versioned.NewEncoder(streaming.NewEncoder(w, dynamicCodec{}), dynamicCodec{})
enc := metav1.NewEncoder(streaming.NewEncoder(w, dynamicCodec{}), dynamicCodec{})
for _, e := range tc.events {
enc.Encode(&e)
}
......
pkg/generated/openapi/zz_generated.openapi.go
View file @ e5019de2
......@@ -2081,6 +2081,30 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{
Dependencies: []string{
"v1.EventSource", "v1.ObjectMeta", "v1.ObjectReference", "v1.Time"},
},
"v1.Event": {
Schema: spec.Schema{
SchemaProps: spec.SchemaProps{
Description: "Event represents a single event to a watched resource.",
Properties: map[string]spec.Schema{
"type": {
SchemaProps: spec.SchemaProps{
Type: []string{"string"},
Format: "",
},
},
"object": {
SchemaProps: spec.SchemaProps{
Description: "Object is:\n * If Type is Added or Modified: the new state of the object.\n * If Type is Deleted: the state of the object immediately before deletion.\n * If Type is Error: *Status is recommended; other types may make sense\n depending on context.",
Ref: spec.MustCreateRef("#/definitions/runtime.RawExtension"),
},
},
},
Required: []string{"type", "object"},
},
},
Dependencies: []string{
"runtime.RawExtension"},
},
"v1.EventList": {
Schema: spec.Schema{
SchemaProps: spec.SchemaProps{
......@@ -2972,6 +2996,30 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{
},
Dependencies: []string{},
},
"v1.InternalEvent": {
Schema: spec.Schema{
SchemaProps: spec.SchemaProps{
Description: "InternalEvent makes watch.Event versioned",
Properties: map[string]spec.Schema{
"Type": {
SchemaProps: spec.SchemaProps{
Type: []string{"string"},
Format: "",
},
},
"Object": {
SchemaProps: spec.SchemaProps{
Description: "Object is:\n * If Type is Added or Modified: the new state of the object.\n * If Type is Deleted: the state of the object immediately before deletion.\n * If Type is Error: *api.Status is recommended; other types may make sense\n depending on context.",
Ref: spec.MustCreateRef("#/definitions/runtime.Object"),
},
},
},
Required: []string{"Type", "Object"},
},
},
Dependencies: []string{
"runtime.Object"},
},
"v1.Job": {
Schema: spec.Schema{
SchemaProps: spec.SchemaProps{
......@@ -15065,28 +15113,4 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{
},
Dependencies: []string{},
},
"versioned.Event": {
Schema: spec.Schema{
SchemaProps: spec.SchemaProps{
Description: "Event represents a single event to a watched resource.",
Properties: map[string]spec.Schema{
"type": {
SchemaProps: spec.SchemaProps{
Type: []string{"string"},
Format: "",
},
},
"object": {
SchemaProps: spec.SchemaProps{
Description: "Object is:\n * If Type is Added or Modified: the new state of the object.\n * If Type is Deleted: the state of the object immediately before deletion.\n * If Type is Error: *api.Status is recommended; other types may make sense\n depending on context.",
Ref: spec.MustCreateRef("#/definitions/runtime.RawExtension"),
},
},
},
Required: []string{"type", "object"},
},
},
Dependencies: []string{
"runtime.RawExtension"},
},
}
pkg/genericapiserver/api/BUILD
View file @ e5019de2
......@@ -73,7 +73,6 @@ go_test(
"//pkg/util/sets:go_default_library",
"//pkg/util/wait:go_default_library",
"//pkg/watch:go_default_library",
"//pkg/watch/versioned:go_default_library",
"//plugin/pkg/admission/admit:go_default_library",
"//plugin/pkg/admission/deny:go_default_library",
"//vendor:github.com/emicklei/go-restful",
......
pkg/genericapiserver/api/apiserver_test.go
View file @ e5019de2
......@@ -54,7 +54,6 @@ import (
"k8s.io/kubernetes/pkg/util/diff"
"k8s.io/kubernetes/pkg/util/sets"
"k8s.io/kubernetes/pkg/watch"
"k8s.io/kubernetes/pkg/watch/versioned"
"k8s.io/kubernetes/plugin/pkg/admission/admit"
"k8s.io/kubernetes/plugin/pkg/admission/deny"
......@@ -161,7 +160,7 @@ func addTestTypes() {
// served in the tests.
api.Scheme.AddKnownTypes(testGroup2Version, &SimpleXGSubresource{}, &metav1.ExportOptions{})
api.Scheme.AddKnownTypes(testInternalGroup2Version, &SimpleXGSubresource{}, &metav1.ExportOptions{})
versioned.AddToGroupVersion(api.Scheme, testGroupVersion)
metav1.AddToGroupVersion(api.Scheme, testGroupVersion)
}
func addNewTestTypes() {
......@@ -179,7 +178,7 @@ func addNewTestTypes() {
&api.DeleteOptions{}, &genericapitesting.SimpleGetOptions{}, &genericapitesting.SimpleRoot{},
&v1.Pod{},
)
versioned.AddToGroupVersion(api.Scheme, newGroupVersion)
metav1.AddToGroupVersion(api.Scheme, newGroupVersion)
}
func init() {
......
pkg/genericapiserver/api/handlers/BUILD
View file @ e5019de2
......@@ -65,7 +65,6 @@ go_library(
"//pkg/util/strategicpatch:go_default_library",
"//pkg/util/wsstream:go_default_library",
"//pkg/watch:go_default_library",
"//pkg/watch/versioned:go_default_library",
"//vendor:github.com/emicklei/go-restful",
"//vendor:github.com/evanphx/json-patch",
"//vendor:github.com/golang/glog",
......
pkg/genericapiserver/api/handlers/watch.go
View file @ e5019de2
......@@ -24,6 +24,7 @@ import (
"time"
"k8s.io/kubernetes/pkg/api/errors"
metav1 "k8s.io/kubernetes/pkg/apis/meta/v1"
"k8s.io/kubernetes/pkg/genericapiserver/api/handlers/negotiation"
"k8s.io/kubernetes/pkg/httplog"
"k8s.io/kubernetes/pkg/runtime"
......@@ -31,7 +32,6 @@ import (
utilruntime "k8s.io/kubernetes/pkg/util/runtime"
"k8s.io/kubernetes/pkg/util/wsstream"
"k8s.io/kubernetes/pkg/watch"
"k8s.io/kubernetes/pkg/watch/versioned"
"github.com/emicklei/go-restful"
"golang.org/x/net/websocket"
......@@ -178,7 +178,7 @@ func (s *WatchServer) ServeHTTP(w http.ResponseWriter, req *http.Request) {
flusher.Flush()
var unknown runtime.Unknown
internalEvent := &versioned.InternalEvent{}
internalEvent := &metav1.InternalEvent{}
buf := &bytes.Buffer{}
ch := s.Watching.ResultChan()
for {
......@@ -207,7 +207,7 @@ func (s *WatchServer) ServeHTTP(w http.ResponseWriter, req *http.Request) {
event.Object = &unknown
// the internal event will be versioned by the encoder
*internalEvent = versioned.InternalEvent(event)
*internalEvent = metav1.InternalEvent(event)
if err := e.Encode(internalEvent); err != nil {
utilruntime.HandleError(fmt.Errorf("unable to encode watch object: %v (%#v)", err, e))
// client disconnect.
......@@ -237,7 +237,7 @@ func (s *WatchServer) HandleWS(ws *websocket.Conn) {
}()
var unknown runtime.Unknown
internalEvent := &versioned.InternalEvent{}
internalEvent := &metav1.InternalEvent{}
buf := &bytes.Buffer{}
streamBuf := &bytes.Buffer{}
ch := s.Watching.ResultChan()
......@@ -265,7 +265,7 @@ func (s *WatchServer) HandleWS(ws *websocket.Conn) {
event.Object = &unknown
// the internal event will be versioned by the encoder
*internalEvent = versioned.InternalEvent(event)
*internalEvent = metav1.InternalEvent(event)
if err := s.Encoder.Encode(internalEvent, streamBuf); err != nil {
// encoding error
utilruntime.HandleError(fmt.Errorf("unable to encode event: %v", err))
......
pkg/genericapiserver/api/watch_test.go
View file @ e5019de2
......@@ -43,7 +43,6 @@ import (
"k8s.io/kubernetes/pkg/util/diff"
"k8s.io/kubernetes/pkg/util/wait"
"k8s.io/kubernetes/pkg/watch"
"k8s.io/kubernetes/pkg/watch/versioned"
)
// watchJSON defines the expected JSON wire equivalent of watch.Event
......@@ -334,7 +333,7 @@ func TestWatchRead(t *testing.T) {
// Send
w.Action(action, object)
// Test receive
var got versioned.Event
var got metav1.Event
_, _, err := d.Decode(nil, &got)
if err != nil {
t.Fatalf("%s: Unexpected error: %v", name, err)
......@@ -356,7 +355,7 @@ func TestWatchRead(t *testing.T) {
}
w.Stop()
var got versioned.Event
var got metav1.Event
_, _, err := d.Decode(nil, &got)
if err == nil {
t.Errorf("Unexpected non-error")
......
pkg/kubectl/cmd/BUILD
View file @ e5019de2
......@@ -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",
......
pkg/kubectl/cmd/get_test.go
View file @ e5019de2
......@@ -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])
}
......
pkg/kubectl/resource/BUILD
View file @ e5019de2
......@@ -73,7 +73,6 @@ go_test(
"//pkg/util/errors:go_default_library",
"//pkg/util/testing:go_default_library",
"//pkg/watch:go_default_library",
"//pkg/watch/versioned:go_default_library",
"//vendor:github.com/ghodss/yaml",
"//vendor:github.com/stretchr/testify/assert",
],
......
pkg/kubectl/resource/builder_test.go
View file @ e5019de2
......@@ -45,7 +45,6 @@ import (
utilerrors "k8s.io/kubernetes/pkg/util/errors"
utiltesting "k8s.io/kubernetes/pkg/util/testing"
"k8s.io/kubernetes/pkg/watch"
"k8s.io/kubernetes/pkg/watch/versioned"
)
func stringBody(body string) io.ReadCloser {
......@@ -55,7 +54,7 @@ func stringBody(body string) io.ReadCloser {
func watchBody(events ...watch.Event) string {
buf := &bytes.Buffer{}
codec := testapi.Default.Codec()
enc := versioned.NewEncoder(streaming.NewEncoder(buf, codec), codec)
enc := metav1.NewEncoder(streaming.NewEncoder(buf, codec), codec)
for _, e := range events {
enc.Encode(&e)
}
......
pkg/registry/extensions/thirdpartyresourcedata/BUILD
View file @ e5019de2
......@@ -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",
],
)
......
pkg/registry/extensions/thirdpartyresourcedata/codec.go
View file @ e5019de2
......@@ -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
}
......
pkg/registry/extensions/thirdpartyresourcedata/codec_test.go
View file @ e5019de2
......@@ -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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment