import k8s.io/apimachinery/pkg/util/json

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

Author: troy0820

go.mod

@@ -32,8 +32,6 @@ require (
 	sigs.k8s.io/yaml v1.4.0
 )
 
-require sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3
-
 require (
 	cel.dev/expr v0.19.1 // indirect
 	github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
@@ -96,6 +94,7 @@ require (
 	k8s.io/component-base v0.33.0 // indirect
 	k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
 	sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 // indirect
+	sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
 	sigs.k8s.io/randfill v1.0.0 // indirect
 	sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
 )

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"
@@ -66,7 +66,6 @@ import (
 	"k8s.io/client-go/kubernetes/scheme"
 	"k8s.io/client-go/testing"
 	"k8s.io/utils/ptr"
-	kjson "sigs.k8s.io/json"
 
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/client/apiutil"
@@ -378,7 +377,7 @@ func convertFromUnstructuredIfNecessary(s *runtime.Scheme, o runtime.Object) (ru
 	if err != nil {
 		return nil, fmt.Errorf("failed to serialize %T: %w", unstructuredSerialized, err)
 	}
-	if err := kjson.UnmarshalCaseSensitivePreserveInts(unstructuredSerialized, typed); err != nil {
+	if err := json.Unmarshal(unstructuredSerialized, typed); err != nil {
 		return nil, fmt.Errorf("failed to unmarshal the content of %T into %T: %w", u, typed, err)
 	}
 
@@ -557,7 +556,7 @@ func (c *fakeClient) Get(ctx context.Context, key client.ObjectKey, obj client.O
 		return err
 	}
 	zero(obj)
-	return kjson.UnmarshalCaseSensitivePreserveInts(j, obj)
+	return json.Unmarshal(j, obj)
 }
 
 func (c *fakeClient) Watch(ctx context.Context, list client.ObjectList, opts ...client.ListOption) (watch.Interface, error) {
@@ -621,7 +620,7 @@ func (c *fakeClient) List(ctx context.Context, obj client.ObjectList, opts ...cl
 	}
 	zero(obj)
 	objCopy := obj.DeepCopyObject().(client.ObjectList)
-	if err := kjson.UnmarshalCaseSensitivePreserveInts(j, objCopy); err != nil {
+	if err := json.Unmarshal(j, objCopy); err != nil {
 		return err
 	}
 
@@ -996,7 +995,7 @@ func (c *fakeClient) patch(obj client.Object, patch client.Patch, opts ...client
 		return err
 	}
 	zero(obj)
-	return kjson.UnmarshalCaseSensitivePreserveInts(j, obj)
+	return json.Unmarshal(j, obj)
 }
 
 // Applying a patch results in a deletionTimestamp that is truncated to the nearest second.
@@ -1048,7 +1047,7 @@ func dryPatch(action testing.PatchActionImpl, tracker testing.ObjectTracker) (ru
 			return nil, err
 		}
 
-		if err = kjson.UnmarshalCaseSensitivePreserveInts(modified, obj); err != nil {
+		if err = json.Unmarshal(modified, obj); err != nil {
 			return nil, err
 		}
 	case types.MergePatchType:
@@ -1057,15 +1056,15 @@ func dryPatch(action testing.PatchActionImpl, tracker testing.ObjectTracker) (ru
 			return nil, err
 		}
 
-		if err := kjson.UnmarshalCaseSensitivePreserveInts(modified, obj); err != nil {
+		if err := json.Unmarshal(modified, obj); err != nil {
 			return nil, err
 		}
 	case types.StrategicMergePatchType:
 		mergedByte, err := strategicpatch.StrategicMergePatch(old, action.GetPatch(), obj)
 		if err != nil {
 			return nil, err
 		}
-		if err = kjson.UnmarshalCaseSensitivePreserveInts(mergedByte, obj); err != nil {
+		if err = json.Unmarshal(mergedByte, obj); err != nil {
 			return nil, err
 		}
 	case types.ApplyPatchType:
@@ -1122,7 +1121,7 @@ func toMapStringAny(obj runtime.Object) (map[string]any, error) {
 	}
 
 	u := map[string]any{}
-	return u, kjson.UnmarshalCaseSensitivePreserveInts(serialized, &u)
+	return u, json.Unmarshal(serialized, &u)
 }
 
 func fromMapStringAny(u map[string]any, target runtime.Object) error {
@@ -1137,7 +1136,7 @@ func fromMapStringAny(u map[string]any, target runtime.Object) error {
 	}
 
 	zero(target)
-	if err := kjson.UnmarshalCaseSensitivePreserveInts(serialized, &target); err != nil {
+	if err := json.Unmarshal(serialized, &target); err != nil {
 		return fmt.Errorf("failed to deserialize: %w", err)
 	}