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

Merge pull request #26044 from smarterclayton/multiversion_encode

Browse Source 
Automatic merge from submit-queue

Guarantee that Encode handles nested objects again
This commit is contained in:
Kubernetes Submit Queue
2016-08-18 21:10:55 -07:00
committed by GitHub
parent c5e3b79f32 12d7032c39
commit c19e9cc89d
44 changed files with 790 additions and 423 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/apis/extensions/register.go
View File

@@ -68,6 +68,7 @@ func addKnownTypes(scheme *runtime.Scheme) error {
&Ingress{},
&IngressList{},
&api.ListOptions{},
&api.DeleteOptions{},
&ReplicaSet{},
&ReplicaSetList{},
&api.ExportOptions{},

4
pkg/apis/extensions/v1beta1/conversion_test.go
View File

@@ -59,7 +59,7 @@ func TestJobSpecConversion(t *testing.T) {
ManualSelector: test.in,
}
v := versioned.JobSpec{}
if err := api.Scheme.Convert(i, &v); err != nil {
if err := api.Scheme.Convert(i, &v, nil); err != nil {
t.Fatalf("unexpected error: %v", err)
}
if !reflect.DeepEqual(test.expectOut, v.AutoSelector) {
@@ -73,7 +73,7 @@ func TestJobSpecConversion(t *testing.T) {
AutoSelector: test.in,
}
e := batch.JobSpec{}
if err := api.Scheme.Convert(i, &e); err != nil {
if err := api.Scheme.Convert(i, &e, nil); err != nil {
t.Fatalf("unexpected error: %v", err)
}
if !reflect.DeepEqual(test.expectOut, e.ManualSelector) {

2
pkg/apis/extensions/v1beta1/defaults_test.go
View File

@@ -728,7 +728,7 @@ func roundTrip(t *testing.T, obj runtime.Object) runtime.Object {
return nil
}
obj3 := reflect.New(reflect.TypeOf(obj).Elem()).Interface().(runtime.Object)
err = api.Scheme.Convert(obj2, obj3)
err = api.Scheme.Convert(obj2, obj3, nil)
if err != nil {
t.Errorf("%v\nSource: %#v", err, obj2)
return nil