diff --git a/go.mod b/go.mod index befe43cf80..e6f85f01fe 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,6 @@ go 1.21 toolchain go1.21.0 require ( - github.com/evanphx/json-patch v5.7.0+incompatible github.com/evanphx/json-patch/v5 v5.7.0 github.com/fsnotify/fsnotify v1.7.0 github.com/go-logr/logr v1.4.1 @@ -44,6 +43,7 @@ require ( github.com/coreos/go-systemd/v22 v22.5.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/emicklei/go-restful/v3 v3.11.0 // indirect + github.com/evanphx/json-patch v5.7.0+incompatible // indirect github.com/felixge/httpsnoop v1.0.3 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/go-openapi/jsonpointer v0.19.6 // indirect diff --git a/pkg/client/fake/client.go b/pkg/client/fake/client.go index 790a1faab1..820b2f58b9 100644 --- a/pkg/client/fake/client.go +++ b/pkg/client/fake/client.go @@ -29,8 +29,7 @@ import ( "sync" "time" - // Using v4 to match upstream - jsonpatch "github.com/evanphx/json-patch" + jsonpatch "github.com/evanphx/json-patch/v5" corev1 "k8s.io/api/core/v1" policyv1 "k8s.io/api/policy/v1" policyv1beta1 "k8s.io/api/policy/v1beta1" @@ -1050,7 +1049,7 @@ func (c *fakeClient) deleteObject(gvr schema.GroupVersionResource, accessor meta } } - //TODO: implement propagation + // TODO: implement propagation return c.tracker.Delete(gvr, accessor.GetNamespace(), accessor.GetName()) }