Skip to content

Commit

Permalink
Use only 1 version of github.com/evanphx/json-patch/v5
Browse files Browse the repository at this point in the history
  • Loading branch information
aerfio committed Jan 8, 2024
1 parent 69e14f1 commit f7887b4
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
5 changes: 2 additions & 3 deletions pkg/client/fake/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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())
}

Expand Down

0 comments on commit f7887b4

Please sign in to comment.