use sigs.k8s.io/json to unmarshal in fakeclient

Signed-off-by: Troy Connor <[email protected]>

Author: troy0820

pkg/client/fake/client.go

@@ -19,7 +19,6 @@ package fake
 import (
 	"bytes"
 	"context"
-	"encoding/json"
 	"errors"
 	"fmt"
 	"reflect"
@@ -58,6 +57,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/types"
+	"k8s.io/apimachinery/pkg/util/json"
 	utilrand "k8s.io/apimachinery/pkg/util/rand"
 	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/apimachinery/pkg/util/strategicpatch"

pkg/client/fake/client_test.go

@@ -1810,6 +1810,38 @@ var _ = Describe("Fake client", func() {
 		Expect(cmp.Diff(objOriginal, actual)).To(BeEmpty())
 	})
 
+	It("should Unmarshal the unstructured object with int64 to preserve ints", func() {
+		obj := &unstructured.Unstructured{}
+		obj.SetAPIVersion("foo/v1")
+		obj.SetKind("Foo")
+		obj.SetName("a-foo")
+
+		err := unstructured.SetNestedMap(obj.Object, map[string]any{"value": json.Number("999")}, "spec")
+		Expect(err).NotTo(HaveOccurred())
+
+		cl := NewClientBuilder().WithStatusSubresource(obj).WithObjects(obj).Build()
+		Expect(cl.Update(context.Background(), obj)).To(Succeed())
+		Expect(cl.Get(context.Background(), client.ObjectKeyFromObject(obj), obj)).To(Succeed())
+
+		Expect(obj.Object["spec"]).To(BeEquivalentTo(map[string]any{"value": int64(999)}))
+	})
+
+	It("should Unmarshal the unstructured object with float64 to preserve ints", func() {
+		obj := &unstructured.Unstructured{}
+		obj.SetAPIVersion("foo/v1")
+		obj.SetKind("Foo")
+		obj.SetName("a-foo")
+
+		err := unstructured.SetNestedMap(obj.Object, map[string]any{"value": 99.9}, "spec")
+		Expect(err).NotTo(HaveOccurred())
+
+		cl := NewClientBuilder().WithStatusSubresource(obj).WithObjects(obj).Build()
+		Expect(cl.Update(context.Background(), obj)).To(Succeed())
+		Expect(cl.Get(context.Background(), client.ObjectKeyFromObject(obj), obj)).To(Succeed())
+
+		Expect(obj.Object["spec"]).To(BeEquivalentTo(map[string]any{"value": float64(99.9)}))
+	})
+
 	It("should not change the status of unstructured objects that are configured to have a status subresource on update", func() {
 		obj := &unstructured.Unstructured{}
 		obj.SetAPIVersion("foo/v1")