github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-22 02:18:51 +00:00
Code Issues Projects Releases Wiki Activity

supply deduced typeconverter to apiserver tests

Browse Source
This commit is contained in:
Alexander Zielenski
2023-03-03 10:45:44 -08:00
parent 302daa889c
commit 94909af68a
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
staging/src/k8s.io/apiserver/pkg/endpoints/apiserver_test.go
View File

@@ -56,6 +56,7 @@ import (
"k8s.io/apimachinery/pkg/runtime/serializer" "k8s.io/apimachinery/pkg/runtime/serializer"
"k8s.io/apimachinery/pkg/runtime/serializer/streaming" "k8s.io/apimachinery/pkg/runtime/serializer/streaming"
"k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/types"
"k8s.io/apimachinery/pkg/util/managedfields"
"k8s.io/apimachinery/pkg/util/net" "k8s.io/apimachinery/pkg/util/net"
utilruntime "k8s.io/apimachinery/pkg/util/runtime" utilruntime "k8s.io/apimachinery/pkg/util/runtime"
"k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/sets"
@@ -231,6 +232,7 @@ func handleInternal(storage map[string]rest.Storage, admissionControl admission.
Creater: scheme, Creater: scheme,
Convertor: scheme, Convertor: scheme,
TypeConverter: managedfields.NewDeducedTypeConverter(),
UnsafeConvertor: runtime.UnsafeObjectConvertor(scheme), UnsafeConvertor: runtime.UnsafeObjectConvertor(scheme),
Defaulter: scheme, Defaulter: scheme,
Typer: scheme, Typer: scheme,
@@ -3339,6 +3341,7 @@ func TestParentResourceIsRequired(t *testing.T) {
Creater: scheme, Creater: scheme,
Convertor: scheme, Convertor: scheme,
UnsafeConvertor: runtime.UnsafeObjectConvertor(scheme), UnsafeConvertor: runtime.UnsafeObjectConvertor(scheme),
TypeConverter: managedfields.NewDeducedTypeConverter(),
Defaulter: scheme, Defaulter: scheme,
Typer: scheme, Typer: scheme,
Namer: namer, Namer: namer,
@@ -3532,6 +3535,8 @@ func TestNamedCreaterWithGenerateName(t *testing.T) {
t.Errorf("unexpected error: %v %#v", err, response) t.Errorf("unexpected error: %v %#v", err, response)
} }
// Avoid comparing managed fields in expected result
itemOut.ManagedFields = nil
itemOut.GetObjectKind().SetGroupVersionKind(schema.GroupVersionKind{}) itemOut.GetObjectKind().SetGroupVersionKind(schema.GroupVersionKind{})
simple.Name = populateName simple.Name = populateName
simple.Namespace = "default" // populated by create handler to match request URL simple.Namespace = "default" // populated by create handler to match request URL
@@ -3612,6 +3617,8 @@ func TestCreate(t *testing.T) {
t.Errorf("unexpected error: %v %#v", err, response) t.Errorf("unexpected error: %v %#v", err, response)
} }
// Avoid comparing managed fields in expected result
itemOut.ManagedFields = nil
itemOut.GetObjectKind().SetGroupVersionKind(schema.GroupVersionKind{}) itemOut.GetObjectKind().SetGroupVersionKind(schema.GroupVersionKind{})
simple.Namespace = "default" // populated by create handler to match request URL simple.Namespace = "default" // populated by create handler to match request URL
if !reflect.DeepEqual(&itemOut, simple) { if !reflect.DeepEqual(&itemOut, simple) {
@@ -3674,6 +3681,8 @@ func TestCreateYAML(t *testing.T) {
t.Fatalf("unexpected error: %v %#v", err, response) t.Fatalf("unexpected error: %v %#v", err, response)
} }
// Avoid comparing managed fields in expected result
itemOut.ManagedFields = nil
itemOut.GetObjectKind().SetGroupVersionKind(schema.GroupVersionKind{}) itemOut.GetObjectKind().SetGroupVersionKind(schema.GroupVersionKind{})
simple.Namespace = "default" // populated by create handler to match request URL simple.Namespace = "default" // populated by create handler to match request URL
if !reflect.DeepEqual(&itemOut, simple) { if !reflect.DeepEqual(&itemOut, simple) {
@@ -3726,6 +3735,8 @@ func TestCreateInNamespace(t *testing.T) {
t.Fatalf("unexpected error: %v\n%s", err, data) t.Fatalf("unexpected error: %v\n%s", err, data)
} }
// Avoid comparing managed fields in expected result
itemOut.ManagedFields = nil
itemOut.GetObjectKind().SetGroupVersionKind(schema.GroupVersionKind{}) itemOut.GetObjectKind().SetGroupVersionKind(schema.GroupVersionKind{})
simple.Namespace = "other" // populated by create handler to match request URL simple.Namespace = "other" // populated by create handler to match request URL
if !reflect.DeepEqual(&itemOut, simple) { if !reflect.DeepEqual(&itemOut, simple) {
@@ -4324,6 +4335,7 @@ func TestXGSubresource(t *testing.T) {
Creater: scheme, Creater: scheme,
Convertor: scheme, Convertor: scheme,
TypeConverter: managedfields.NewDeducedTypeConverter(),
UnsafeConvertor: runtime.UnsafeObjectConvertor(scheme), UnsafeConvertor: runtime.UnsafeObjectConvertor(scheme),
Defaulter: scheme, Defaulter: scheme,
Typer: scheme, Typer: scheme,