Merge pull request #105896 from zqzten/upgrade-json-patch
upgrade json-patch to v4.12.0 Kubernetes-commit: 18cb34ebb2b64a7607057c7dea80427e2af387f3
This commit is contained in:
commit
0b81755902
32
go.mod
32
go.mod
|
|
@ -10,7 +10,7 @@ require (
|
|||
github.com/davecgh/go-spew v1.1.1
|
||||
github.com/daviddengcn/go-colortext v0.0.0-20160507010035-511bcaf42ccd
|
||||
github.com/docker/distribution v2.7.1+incompatible
|
||||
github.com/evanphx/json-patch v4.11.0+incompatible
|
||||
github.com/evanphx/json-patch v4.12.0+incompatible
|
||||
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d
|
||||
github.com/fatih/camelcase v1.0.0
|
||||
github.com/fvbommel/sortorder v1.0.1
|
||||
|
|
@ -31,15 +31,15 @@ require (
|
|||
github.com/stretchr/testify v1.7.0
|
||||
golang.org/x/sys v0.0.0-20210820121016-41cdb8703e55
|
||||
gopkg.in/yaml.v2 v2.4.0
|
||||
k8s.io/api v0.0.0-20211022203536-7d47955f01bd
|
||||
k8s.io/apimachinery v0.0.0-20211022203306-153f11a7f300
|
||||
k8s.io/cli-runtime v0.0.0-20211022210040-18965cbf2e62
|
||||
k8s.io/client-go v0.0.0-20211022203833-56656ba0e04f
|
||||
k8s.io/component-base v0.0.0-20211022204341-77b90367040a
|
||||
k8s.io/component-helpers v0.0.0-20211022204454-b3236b395fbf
|
||||
k8s.io/api v0.0.0-20211027003525-5604a481de2c
|
||||
k8s.io/apimachinery v0.0.0-20211027003259-a39cb4b7e43a
|
||||
k8s.io/cli-runtime v0.0.0-20211027005851-fd0a6d95140a
|
||||
k8s.io/client-go v0.0.0-20211027003826-651ddcb5a2b9
|
||||
k8s.io/component-base v0.0.0-20211027004438-bd08cb7812c3
|
||||
k8s.io/component-helpers v0.0.0-20211027004542-73bcdef827e4
|
||||
k8s.io/klog/v2 v2.30.0
|
||||
k8s.io/kube-openapi v0.0.0-20210817084001-7fbd8d59e5b8
|
||||
k8s.io/metrics v0.0.0-20211022205919-b66fbebe2989
|
||||
k8s.io/metrics v0.0.0-20211027005740-e276d9db6a9e
|
||||
k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b
|
||||
sigs.k8s.io/kustomize/kustomize/v4 v4.2.0
|
||||
sigs.k8s.io/kustomize/kyaml v0.11.0
|
||||
|
|
@ -47,12 +47,12 @@ require (
|
|||
)
|
||||
|
||||
replace (
|
||||
k8s.io/api => k8s.io/api v0.0.0-20211022203536-7d47955f01bd
|
||||
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20211022203306-153f11a7f300
|
||||
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20211022210040-18965cbf2e62
|
||||
k8s.io/client-go => k8s.io/client-go v0.0.0-20211022203833-56656ba0e04f
|
||||
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20211022203048-1ca1c4b1a3d6
|
||||
k8s.io/component-base => k8s.io/component-base v0.0.0-20211022204341-77b90367040a
|
||||
k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20211022204454-b3236b395fbf
|
||||
k8s.io/metrics => k8s.io/metrics v0.0.0-20211022205919-b66fbebe2989
|
||||
k8s.io/api => k8s.io/api v0.0.0-20211027003525-5604a481de2c
|
||||
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20211027003259-a39cb4b7e43a
|
||||
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20211027005851-fd0a6d95140a
|
||||
k8s.io/client-go => k8s.io/client-go v0.0.0-20211027003826-651ddcb5a2b9
|
||||
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20211026222709-e92ab9f4d5a1
|
||||
k8s.io/component-base => k8s.io/component-base v0.0.0-20211027004438-bd08cb7812c3
|
||||
k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20211027004542-73bcdef827e4
|
||||
k8s.io/metrics => k8s.io/metrics v0.0.0-20211027005740-e276d9db6a9e
|
||||
)
|
||||
|
|
|
|||
33
go.sum
33
go.sum
|
|
@ -120,8 +120,9 @@ github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5y
|
|||
github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
|
||||
github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
|
||||
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
|
||||
github.com/evanphx/json-patch v4.11.0+incompatible h1:glyUF9yIYtMHzn8xaKw5rMhdWcwsYV8dZHIq5567/xs=
|
||||
github.com/evanphx/json-patch v4.11.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
|
||||
github.com/evanphx/json-patch v4.12.0+incompatible h1:4onqiflcdA9EOZ4RxV643DvftH5pOlLGNtQ5lPWQu84=
|
||||
github.com/evanphx/json-patch v4.12.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
|
||||
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d h1:105gxyaGwCFad8crR9dcMQWvV9Hvulu6hwUh4tWPJnM=
|
||||
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d/go.mod h1:ZZMPRZwes7CROmyNKgQzC3XPs6L/G2EJLHddWejkmf4=
|
||||
github.com/fatih/camelcase v1.0.0 h1:hxNvNX/xYBp0ovncs8WyWZrOrpBNub/JfaMvbURyft8=
|
||||
|
|
@ -901,19 +902,19 @@ 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-20211022203536-7d47955f01bd h1:t2LT7M8JRuofDih9ziRvu/Vyla8Ej3yjSrxJ9FgB3Pc=
|
||||
k8s.io/api v0.0.0-20211022203536-7d47955f01bd/go.mod h1:eJg/6b+/Rz9bOKmx0Edyb0/GSov2ZHPYDXoxbqMJgKg=
|
||||
k8s.io/apimachinery v0.0.0-20211022203306-153f11a7f300 h1:SaXMD0Olvi/V70/K8OKFF4e/+b21wKuSolzf5Uk2Lak=
|
||||
k8s.io/apimachinery v0.0.0-20211022203306-153f11a7f300/go.mod h1:Us141aTxAE+ha/FV0yDwUGmNqwDlF6EpCGN/6w1eLZk=
|
||||
k8s.io/cli-runtime v0.0.0-20211022210040-18965cbf2e62 h1:QubcMdQBmFTm8Bkph3f04Jr7vhdfKY5qBmzul5o8IGQ=
|
||||
k8s.io/cli-runtime v0.0.0-20211022210040-18965cbf2e62/go.mod h1:vuNj+7N+4NBUbF0hkkCknvaispWrD4apUqKhen6odHE=
|
||||
k8s.io/client-go v0.0.0-20211022203833-56656ba0e04f h1:iNLSkW213TvDoHY+523SpD5SLktbXnr5ZuJ7Xfm2G9c=
|
||||
k8s.io/client-go v0.0.0-20211022203833-56656ba0e04f/go.mod h1:J/CKd1tfft/vlmtgr40pGEK4bXNV0EZOQtV3cXS09IA=
|
||||
k8s.io/code-generator v0.0.0-20211022203048-1ca1c4b1a3d6/go.mod h1:alK4pz5+y/zKXOPBnND3TvXOC/iF2oYTBDynHO1+qlI=
|
||||
k8s.io/component-base v0.0.0-20211022204341-77b90367040a h1:2jEZKdDEhjwIacbANPC057Q/f0Q4Phwwv7TPpMBMRYc=
|
||||
k8s.io/component-base v0.0.0-20211022204341-77b90367040a/go.mod h1:Ntx6wQVfe1+jiwlrNaGcEVGKsnUmrEJoF4nCG4xUjfg=
|
||||
k8s.io/component-helpers v0.0.0-20211022204454-b3236b395fbf h1:4vM1BViILqe6/5bvUy8PqtPI0Fd9EpdSymFPsisYtyU=
|
||||
k8s.io/component-helpers v0.0.0-20211022204454-b3236b395fbf/go.mod h1:haH7DWaNW17jSuPpKw44c4sbLpYnzS2v/JW2EOtFm5A=
|
||||
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/cli-runtime v0.0.0-20211027005851-fd0a6d95140a h1:6N6d0a80cFO2PI8RssKTsofnWWdzr4LBWKKe0t+1kAk=
|
||||
k8s.io/cli-runtime v0.0.0-20211027005851-fd0a6d95140a/go.mod h1:C/9bEqryTALzT3y/AJFeg2TqzudoaRZrdr4Zdoeetn0=
|
||||
k8s.io/client-go v0.0.0-20211027003826-651ddcb5a2b9 h1:whNIzMydUAp8BPMRqVmgKDgScH5n5bHPAo8bx85rUVs=
|
||||
k8s.io/client-go v0.0.0-20211027003826-651ddcb5a2b9/go.mod h1:lpux6w9aCpaOS5nNGODOQWjXfju0jAj9vNVDqK6AoTw=
|
||||
k8s.io/code-generator v0.0.0-20211026222709-e92ab9f4d5a1/go.mod h1:alK4pz5+y/zKXOPBnND3TvXOC/iF2oYTBDynHO1+qlI=
|
||||
k8s.io/component-base v0.0.0-20211027004438-bd08cb7812c3 h1:Hx2Olj7sA4W9r8veeamsvNiiYf5SMTN/N/1uAMQk13c=
|
||||
k8s.io/component-base v0.0.0-20211027004438-bd08cb7812c3/go.mod h1:7xqZFY7A2hOLqh+cOR9jinp+xJVXp6F5I1rOO+kBKJc=
|
||||
k8s.io/component-helpers v0.0.0-20211027004542-73bcdef827e4 h1:8umcjzLRjGapYYFQ4SUIwXCoLi8orNIce0ll3OQ+tmg=
|
||||
k8s.io/component-helpers v0.0.0-20211027004542-73bcdef827e4/go.mod h1:FYNL/FrbLSYkD3DokSWxRcQI1yxAQQpeRkJbm+m9jRc=
|
||||
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
|
||||
k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
|
||||
k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
|
||||
|
|
@ -923,8 +924,8 @@ k8s.io/klog/v2 v2.30.0/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
|
|||
k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e/go.mod h1:vHXdDvt9+2spS2Rx9ql3I8tycm3H9FDfdUoIuKCefvw=
|
||||
k8s.io/kube-openapi v0.0.0-20210817084001-7fbd8d59e5b8 h1:Xxl9TLJ30BJ1pGWfGZnqbpww2rwOt3RAzbSz+omQGtg=
|
||||
k8s.io/kube-openapi v0.0.0-20210817084001-7fbd8d59e5b8/go.mod h1:foAE7XkrXQ1Qo2eWsW/iWksptrVdbl6t+vscSdmmGjk=
|
||||
k8s.io/metrics v0.0.0-20211022205919-b66fbebe2989 h1:2G93O1Nn3edO7CqDeNX4Ie+W/lfAipVSL/1E287ZMRA=
|
||||
k8s.io/metrics v0.0.0-20211022205919-b66fbebe2989/go.mod h1:RPGnR0OGpqGkfI5b34NKRdblJ7cH5iYqXS0KeR55gUY=
|
||||
k8s.io/metrics v0.0.0-20211027005740-e276d9db6a9e h1:xqZB2why0n/Xp6FczpSHRrgfxSFU54Og+sp3zHXnxc0=
|
||||
k8s.io/metrics v0.0.0-20211027005740-e276d9db6a9e/go.mod h1:H2K/8mL6glAaL5f+yLXWa62H3IqRsgNJ9vEWrkTR1bc=
|
||||
k8s.io/utils v0.0.0-20210802155522-efc7438f0176/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
|
||||
k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b h1:wxEMGetGMur3J1xuGLQY7GEQYg9bZxKn3tKo5k/eYcs=
|
||||
k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
|
||||
|
|
|
|||
Loading…
Reference in New Issue