github/client-go
1
0
Fork 0
mirror of https://github.com/kubernetes/client-go.git synced 2025-07-19 01:27:10 +00:00
Code Issues Projects Releases Wiki Activity

ManagedFieldsObjectTracker: Reload scheme

Browse Source 
In controller-runtime it is generally not expected to do any sort of
scheme registration if unstructured.Unstructured is used. To make this
work in the fakeclient, the fakeclient will register unstructured to
scheme if the scheme doesn't recognize the GVK.

This currently doesn't work with the `ManagedFieldsObjectTracker` as it
never reloads the scheme. This change makes it reload the scheme in an
inefficient but simple manner, which should be good enough for unit
tests.

Kubernetes-commit: 1cd71cbb14ecfd0ec6c5e8a57db6be00ecb8a4d1
This commit is contained in:
Alvaro Aleman 2025-03-02 12:43:08 -05:00 committed by Kubernetes Publisher
parent 26cda34605
commit a539a79dea
2 changed files with 32 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
testing/fixture.go
View File

@ -631,7 +631,7 @@ type managedFieldObjectTracker struct {
ObjectTracker
scheme ObjectScheme
objectConverter runtime.ObjectConvertor
mapper meta.RESTMapper
mapper func() meta.RESTMapper
typeConverter managedfields.TypeConverter
}
@ -644,8 +644,10 @@ func NewFieldManagedObjectTracker(scheme *runtime.Scheme, decoder runtime.Decode
ObjectTracker: NewObjectTracker(scheme, decoder),
scheme: scheme,
objectConverter: scheme,
mapper: testrestmapper.TestOnlyStaticRESTMapper(scheme),
typeConverter: typeConverter,
mapper: func() meta.RESTMapper {
return testrestmapper.TestOnlyStaticRESTMapper(scheme)
},
typeConverter: typeConverter,
}
}
@ -654,7 +656,7 @@ func (t *managedFieldObjectTracker) Create(gvr schema.GroupVersionResource, obj
if err != nil {
return err
}
gvk, err := t.mapper.KindFor(gvr)
gvk, err := t.mapper().KindFor(gvr)
if err != nil {
return err
}
@ -698,8 +700,9 @@ func (t *managedFieldObjectTracker) Update(gvr schema.GroupVersionResource, obj
if err != nil {
return err
}
gvk, err := t.mapper.KindFor(gvr)
gvk, err := t.mapper().KindFor(gvr)
if err != nil {
println("kindfor")
return err
}
mgr, err := t.fieldManagerFor(gvk)
@ -728,7 +731,7 @@ func (t *managedFieldObjectTracker) Patch(gvr schema.GroupVersionResource, patch
if err != nil {
return err
}
gvk, err := t.mapper.KindFor(gvr)
gvk, err := t.mapper().KindFor(gvr)
if err != nil {
return err
}
@ -757,7 +760,7 @@ func (t *managedFieldObjectTracker) Apply(gvr schema.GroupVersionResource, apply
if err != nil {
return err
}
gvk, err := t.mapper.KindFor(gvr)
gvk, err := t.mapper().KindFor(gvr)
if err != nil {
return err
}

22
testing/fixture_test.go
View File

@ -661,3 +661,25 @@ var configMapTypedSchema = typed.YAMLObject(`types:
namedType: __untyped_deduced_
elementRelationship: separable
`)
func TestManagedFieldsObjectTrackerReloadsScheme(t *testing.T) {
cmResource := schema.GroupVersionResource{Version: "v1", Resource: "configmaps"}
scheme := runtime.NewScheme()
codecs := serializer.NewCodecFactory(scheme)
// Create tracker without registered ConfigMap type
tracker := NewFieldManagedObjectTracker(scheme, codecs.UniversalDecoder(), configMapTypeConverter(scheme))
cm := &v1.ConfigMap{
ObjectMeta: metav1.ObjectMeta{
Name: "test-cm",
},
Data: map[string]string{"key": "value"},
}
// Register the type in scheme
scheme.AddKnownTypes(cmResource.GroupVersion(), &v1.ConfigMap{})
err := tracker.Create(cmResource, cm, "default", metav1.CreateOptions{FieldManager: "test-manager"})
assert.NoError(t, err, "Create should succeed after registering type")
}