Skip to content

Commit 2406935

Browse files
committed
downgrade "github.com/evanphx/json-patch" dependency to v4.12.0+incompatible
1 parent f7887b4 commit 2406935

File tree

4 files changed

+8
-7
lines changed

4 files changed

+8
-7
lines changed

examples/scratch-env/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
88
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
99
github.com/emicklei/go-restful/v3 v3.11.0 h1:rAQeMHw1c7zTmncogyy8VvRZwtkmkZ4FxERmMY4rD+g=
1010
github.com/emicklei/go-restful/v3 v3.11.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
11-
github.com/evanphx/json-patch v5.7.0+incompatible h1:vgGkfT/9f8zE6tvSCe74nfpAVDQ2tG6yudJd8LBksgI=
12-
github.com/evanphx/json-patch v5.7.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
11+
github.com/evanphx/json-patch v4.12.0+incompatible h1:4onqiflcdA9EOZ4RxV643DvftH5pOlLGNtQ5lPWQu84=
12+
github.com/evanphx/json-patch v4.12.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
1313
github.com/evanphx/json-patch/v5 v5.7.0 h1:nJqP7uwL84RJInrohHfW0Fx3awjbm8qZeFv0nW9SYGc=
1414
github.com/evanphx/json-patch/v5 v5.7.0/go.mod h1:VNkHZ/282BpEyt/tObQO8s5CMPmYYq14uClGH4abBuQ=
1515
github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA=

go.mod

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

77
require (
8+
github.com/evanphx/json-patch v4.12.0+incompatible // Using v4 to match upstream
89
github.com/evanphx/json-patch/v5 v5.7.0
910
github.com/fsnotify/fsnotify v1.7.0
1011
github.com/go-logr/logr v1.4.1
@@ -43,7 +44,6 @@ require (
4344
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
4445
github.com/davecgh/go-spew v1.1.1 // indirect
4546
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

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ github.com/emicklei/go-restful/v3 v3.11.0 h1:rAQeMHw1c7zTmncogyy8VvRZwtkmkZ4FxER
3737
github.com/emicklei/go-restful/v3 v3.11.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
3838
github.com/envoyproxy/protoc-gen-validate v1.0.2 h1:QkIBuU5k+x7/QXPvPPnWXWlCdaBFApVqftFV6k087DA=
3939
github.com/envoyproxy/protoc-gen-validate v1.0.2/go.mod h1:GpiZQP3dDbg4JouG/NNS7QWXpgx6x8QiMKdmN72jogE=
40-
github.com/evanphx/json-patch v5.7.0+incompatible h1:vgGkfT/9f8zE6tvSCe74nfpAVDQ2tG6yudJd8LBksgI=
41-
github.com/evanphx/json-patch v5.7.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
40+
github.com/evanphx/json-patch v4.12.0+incompatible h1:4onqiflcdA9EOZ4RxV643DvftH5pOlLGNtQ5lPWQu84=
41+
github.com/evanphx/json-patch v4.12.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
4242
github.com/evanphx/json-patch/v5 v5.7.0 h1:nJqP7uwL84RJInrohHfW0Fx3awjbm8qZeFv0nW9SYGc=
4343
github.com/evanphx/json-patch/v5 v5.7.0/go.mod h1:VNkHZ/282BpEyt/tObQO8s5CMPmYYq14uClGH4abBuQ=
4444
github.com/felixge/httpsnoop v1.0.3 h1:s/nj+GCswXYzN5v2DpNMuMQYe+0DDwt5WVCU6CWBdXk=

pkg/client/fake/client.go

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

32-
jsonpatch "github.com/evanphx/json-patch/v5"
32+
// Using v4 to match upstream
33+
jsonpatch "github.com/evanphx/json-patch"
3334
corev1 "k8s.io/api/core/v1"
3435
policyv1 "k8s.io/api/policy/v1"
3536
policyv1beta1 "k8s.io/api/policy/v1beta1"
@@ -1049,7 +1050,7 @@ func (c *fakeClient) deleteObject(gvr schema.GroupVersionResource, accessor meta
10491050
}
10501051
}
10511052

1052-
// TODO: implement propagation
1053+
//TODO: implement propagation
10531054
return c.tracker.Delete(gvr, accessor.GetNamespace(), accessor.GetName())
10541055
}
10551056

0 commit comments

Comments
 (0)