Merge pull request #132004 from alvaroaleman/fix-fasf

k8s-ci-robot · web-flow · commit c5c87bde8f0f · 2025-05-29T16:54:17.000-07:00
ManagedFieldsObjectTracker: Reload scheme
diff --git a/staging/src/k8s.io/client-go/testing/fixture.go b/staging/src/k8s.io/client-go/testing/fixture.go
@@ -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
 	}
diff --git a/staging/src/k8s.io/client-go/testing/fixture_test.go b/staging/src/k8s.io/client-go/testing/fixture_test.go
@@ -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")
+}

Original file line number	Diff line number	Diff line change
`@@ -631,7 +631,7 @@ type managedFieldObjectTracker struct {`
`631`	`631`	`ObjectTracker`
`632`	`632`	`scheme ObjectScheme`
`633`	`633`	`objectConverter runtime.ObjectConvertor`
`634`		`- mapper meta.RESTMapper`
	`634`	`+ mapper func() meta.RESTMapper`
`635`	`635`	`typeConverter managedfields.TypeConverter`
`636`	`636`	`}`
`637`	`637`
`@@ -644,8 +644,10 @@ func NewFieldManagedObjectTracker(scheme *runtime.Scheme, decoder runtime.Decode`
`644`	`644`	`ObjectTracker: NewObjectTracker(scheme, decoder),`
`645`	`645`	`scheme: scheme,`
`646`	`646`	`objectConverter: scheme,`
`647`		`- mapper: testrestmapper.TestOnlyStaticRESTMapper(scheme),`
`648`		`- typeConverter: typeConverter,`
	`647`	`+ mapper: func() meta.RESTMapper {`
	`648`	`+ return testrestmapper.TestOnlyStaticRESTMapper(scheme)`
	`649`	`+ },`
	`650`	`+ typeConverter: typeConverter,`
`649`	`651`	`}`
`650`	`652`	`}`
`651`	`653`
`@@ -654,7 +656,7 @@ func (t *managedFieldObjectTracker) Create(gvr schema.GroupVersionResource, obj`
`654`	`656`	`if err != nil {`
`655`	`657`	`return err`
`656`	`658`	`}`
`657`		`- gvk, err := t.mapper.KindFor(gvr)`
	`659`	`+ gvk, err := t.mapper().KindFor(gvr)`
`658`	`660`	`if err != nil {`
`659`	`661`	`return err`
`660`	`662`	`}`
`@@ -698,8 +700,9 @@ func (t *managedFieldObjectTracker) Update(gvr schema.GroupVersionResource, obj`
`698`	`700`	`if err != nil {`
`699`	`701`	`return err`
`700`	`702`	`}`
`701`		`- gvk, err := t.mapper.KindFor(gvr)`
	`703`	`+ gvk, err := t.mapper().KindFor(gvr)`
`702`	`704`	`if err != nil {`
	`705`	`+ println("kindfor")`
`703`	`706`	`return err`
`704`	`707`	`}`
`705`	`708`	`mgr, err := t.fieldManagerFor(gvk)`
`@@ -728,7 +731,7 @@ func (t *managedFieldObjectTracker) Patch(gvr schema.GroupVersionResource, patch`
`728`	`731`	`if err != nil {`
`729`	`732`	`return err`
`730`	`733`	`}`
`731`		`- gvk, err := t.mapper.KindFor(gvr)`
	`734`	`+ gvk, err := t.mapper().KindFor(gvr)`
`732`	`735`	`if err != nil {`
`733`	`736`	`return err`
`734`	`737`	`}`
`@@ -757,7 +760,7 @@ func (t *managedFieldObjectTracker) Apply(gvr schema.GroupVersionResource, apply`
`757`	`760`	`if err != nil {`
`758`	`761`	`return err`
`759`	`762`	`}`
`760`		`- gvk, err := t.mapper.KindFor(gvr)`
	`763`	`+ gvk, err := t.mapper().KindFor(gvr)`
`761`	`764`	`if err != nil {`
`762`	`765`	`return err`
`763`	`766`	`}`