Skip to content

Commit 54a34a4

Browse files
committed
Update json-patch package
Move the json-patch package off of the incompatible module path. We have tests around this functionality and they pass before/after the change.
1 parent af37ca7 commit 54a34a4

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

go.mod

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module github.com/crunchydata/postgres-operator
33
go 1.17
44

55
require (
6-
github.com/evanphx/json-patch v5.6.0+incompatible
6+
github.com/evanphx/json-patch/v5 v5.6.0
77
github.com/go-logr/logr v0.4.0
88
github.com/google/go-cmp v0.5.7
99
github.com/google/uuid v1.3.0
@@ -36,6 +36,7 @@ require (
3636
github.com/cespare/xxhash/v2 v2.1.1 // indirect
3737
github.com/davecgh/go-spew v1.1.1 // indirect
3838
github.com/docker/spdystream v0.0.0-20181023171402-6480d4af844c // indirect
39+
github.com/evanphx/json-patch v4.9.0+incompatible // indirect
3940
github.com/felixge/httpsnoop v1.0.2 // indirect
4041
github.com/fsnotify/fsnotify v1.5.1 // indirect
4142
github.com/gogo/protobuf v1.3.2 // indirect

go.sum

+4-2
Original file line numberDiff line numberDiff line change
@@ -116,9 +116,10 @@ github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.m
116116
github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0=
117117
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
118118
github.com/evanphx/json-patch v4.5.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
119+
github.com/evanphx/json-patch v4.9.0+incompatible h1:kLcOMZeuLAJvL2BPWLMIj5oaZQobrkAqrL+WFZwQses=
119120
github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
120-
github.com/evanphx/json-patch v5.6.0+incompatible h1:jBYDEEiFBPxA0v50tFdvOzQQTCvpL6mnFh5mB2/l16U=
121-
github.com/evanphx/json-patch v5.6.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
121+
github.com/evanphx/json-patch/v5 v5.6.0 h1:b91NhWfaz02IuVxO9faSllyAtNXHMPkC5J8sJCLunww=
122+
github.com/evanphx/json-patch/v5 v5.6.0/go.mod h1:G79N1coSVB93tBe7j6PhzjmR3/2VvlbKOFpnXhI9Bw4=
122123
github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
123124
github.com/felixge/httpsnoop v1.0.2 h1:+nS9g82KMXccJ/wp0zyRW9ZBHFETmMGtkk+2CTTrW4o=
124125
github.com/felixge/httpsnoop v1.0.2/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
@@ -264,6 +265,7 @@ github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJ
264265
github.com/imdario/mergo v0.3.10 h1:6q5mVkdH/vYmqngx7kZQTjJ5HRsx+ImorDIEQ+beJgc=
265266
github.com/imdario/mergo v0.3.10/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
266267
github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
268+
github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
267269
github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
268270
github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
269271
github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=

internal/controller/postgrescluster/apply.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"fmt"
2222
"reflect"
2323

24-
jsonpatch "github.com/evanphx/json-patch"
24+
jsonpatch "github.com/evanphx/json-patch/v5"
2525
"github.com/pkg/errors"
2626
appsv1 "k8s.io/api/apps/v1"
2727
batchv1 "k8s.io/api/batch/v1"

0 commit comments

Comments
 (0)