Merge pull request #105896 from zqzten/upgrade-json-patch

upgrade json-patch to v4.12.0

Kubernetes-commit: 18cb34ebb2b64a7607057c7dea80427e2af387f3
This commit is contained in:
Kubernetes Publisher
2021-10-26 15:27:09 -07:00
parent 1e6b5d960d
commit 651ddcb5a2
2 changed files with 8 additions and 5 deletions

9
go.mod
View File

@@ -30,8 +30,8 @@ require (
golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac
google.golang.org/protobuf v1.26.0
k8s.io/api v0.0.0
k8s.io/apimachinery v0.0.0
k8s.io/api v0.0.0-20211027003525-5604a481de2c
k8s.io/apimachinery v0.0.0-20211027003259-a39cb4b7e43a
k8s.io/klog/v2 v2.30.0
k8s.io/kube-openapi v0.0.0-20210817084001-7fbd8d59e5b8
k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b
@@ -40,7 +40,6 @@ require (
)
replace (
k8s.io/api => ../api
k8s.io/apimachinery => ../apimachinery
k8s.io/client-go => ../client-go
k8s.io/api => k8s.io/api v0.0.0-20211027003525-5604a481de2c
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20211027003259-a39cb4b7e43a
)

4
go.sum
View File

@@ -598,6 +598,10 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
k8s.io/api v0.0.0-20211027003525-5604a481de2c h1:Tnv3SUCN/XI+cKUswX/DaaTjbZUYV6Rf/1lIWEdDvLI=
k8s.io/api v0.0.0-20211027003525-5604a481de2c/go.mod h1:FBKdg4CgNljGEmNwAg4dU/YOL9216JaN8EMrLzRcpvk=
k8s.io/apimachinery v0.0.0-20211027003259-a39cb4b7e43a h1:0ipBhp8NPPsCxYT+zL42GEB+f7Tc+82+vCkOoYdr8Fg=
k8s.io/apimachinery v0.0.0-20211027003259-a39cb4b7e43a/go.mod h1:oyH3LcOKLLooQH1NlpHlilzkWxqsiHWETyHgssntcXg=
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
k8s.io/klog/v2 v2.30.0 h1:bUO6drIvCIsvZ/XFgfxoGFQU/a4Qkh0iAlvUR7vlHJw=