From 948ab9175a8151af44fb958c6511c6d756c983be Mon Sep 17 00:00:00 2001 From: Antoine Pelisse Date: Thu, 8 Dec 2022 09:24:14 -0800 Subject: [PATCH] Fix FakeObjectCreater ignoring given gvk --- .../fieldmanagertest/testfieldmanager.go | 16 +++++++--------- .../handlers/fieldmanager/skipnonapplied_test.go | 8 ++++---- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/fieldmanagertest/testfieldmanager.go b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/fieldmanagertest/testfieldmanager.go index 8f9d41bd633..e6c3283285c 100644 --- a/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/fieldmanagertest/testfieldmanager.go +++ b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/fieldmanagertest/testfieldmanager.go @@ -102,18 +102,16 @@ func (sameVersionConverter) IsMissingVersionError(error) bool { // NewFakeObjectCreater implements ObjectCreater, it can create empty // objects (unstructured) of the given GVK. -func NewFakeObjectCreater(gvk schema.GroupVersionKind) runtime.ObjectCreater { - return &fakeObjectCreater{gvk: gvk} +func NewFakeObjectCreater() runtime.ObjectCreater { + return &fakeObjectCreater{} } -type fakeObjectCreater struct { - gvk schema.GroupVersionKind -} +type fakeObjectCreater struct{} -func (f *fakeObjectCreater) New(_ schema.GroupVersionKind) (runtime.Object, error) { +func (f *fakeObjectCreater) New(gvk schema.GroupVersionKind) (runtime.Object, error) { u := unstructured.Unstructured{Object: map[string]interface{}{}} - u.SetAPIVersion(f.gvk.GroupVersion().String()) - u.SetKind(f.gvk.Kind) + u.SetAPIVersion(gvk.GroupVersion().String()) + u.SetKind(gvk.Kind) return &u, nil } @@ -167,7 +165,7 @@ func NewTestFieldManager(gvk schema.GroupVersionKind, subresource string, chainF fieldmanager.NewManagedFieldsUpdater( fieldmanager.NewStripMetaManager(f), ), gvk.GroupVersion(), subresource, - ), NewFakeObjectCreater(gvk), gvk, fieldmanager.DefaultTrackOnCreateProbability, + ), NewFakeObjectCreater(), gvk, fieldmanager.DefaultTrackOnCreateProbability, ), typeConverter, objectConverter, gvk.GroupVersion(), ), ) diff --git a/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/skipnonapplied_test.go b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/skipnonapplied_test.go index 3ef5cb74367..fc99a9b2fc2 100644 --- a/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/skipnonapplied_test.go +++ b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/skipnonapplied_test.go @@ -33,8 +33,8 @@ func TestNoUpdateBeforeFirstApply(t *testing.T) { f := fieldmanagertest.NewTestFieldManager(schema.FromAPIVersionAndKind("v1", "Pod"), "", func(m fieldmanager.Manager) fieldmanager.Manager { return fieldmanager.NewSkipNonAppliedManager( m, - fieldmanagertest.NewFakeObjectCreater(schema.FromAPIVersionAndKind("v1", "Pod")), - schema.GroupVersionKind{}, + fieldmanagertest.NewFakeObjectCreater(), + schema.FromAPIVersionAndKind("v1", "Pod"), ) }) @@ -73,8 +73,8 @@ func TestUpdateBeforeFirstApply(t *testing.T) { f := fieldmanagertest.NewTestFieldManager(schema.FromAPIVersionAndKind("v1", "Pod"), "", func(m fieldmanager.Manager) fieldmanager.Manager { return fieldmanager.NewSkipNonAppliedManager( m, - fieldmanagertest.NewFakeObjectCreater(schema.FromAPIVersionAndKind("v1", "Pod")), - schema.GroupVersionKind{}, + fieldmanagertest.NewFakeObjectCreater(), + schema.FromAPIVersionAndKind("v1", "Pod"), ) })