Skip to content

Commit f7887b4

Browse files
committed
Use only 1 version of github.com/evanphx/json-patch/v5
1 parent 69e14f1 commit f7887b4

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ go 1.21
55
toolchain go1.21.0
66

77
require (
8-
github.com/evanphx/json-patch v5.7.0+incompatible
98
github.com/evanphx/json-patch/v5 v5.7.0
109
github.com/fsnotify/fsnotify v1.7.0
1110
github.com/go-logr/logr v1.4.1
@@ -44,6 +43,7 @@ require (
4443
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
4544
github.com/davecgh/go-spew v1.1.1 // indirect
4645
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
46+
github.com/evanphx/json-patch v5.7.0+incompatible // indirect
4747
github.com/felixge/httpsnoop v1.0.3 // indirect
4848
github.com/go-logr/stdr v1.2.2 // indirect
4949
github.com/go-openapi/jsonpointer v0.19.6 // indirect

pkg/client/fake/client.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@ import (
2929
"sync"
3030
"time"
3131

32-
// Using v4 to match upstream
33-
jsonpatch "github.com/evanphx/json-patch"
32+
jsonpatch "github.com/evanphx/json-patch/v5"
3433
corev1 "k8s.io/api/core/v1"
3534
policyv1 "k8s.io/api/policy/v1"
3635
policyv1beta1 "k8s.io/api/policy/v1beta1"
@@ -1050,7 +1049,7 @@ func (c *fakeClient) deleteObject(gvr schema.GroupVersionResource, accessor meta
10501049
}
10511050
}
10521051

1053-
//TODO: implement propagation
1052+
// TODO: implement propagation
10541053
return c.tracker.Delete(gvr, accessor.GetNamespace(), accessor.GetName())
10551054
}
10561055

0 commit comments

Comments
 (0)