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
commit db6e7e1069
2 changed files with 18 additions and 18 deletions

16
go.mod
View File

@ -5,16 +5,16 @@ module k8s.io/sample-controller
go 1.16
require (
k8s.io/api v0.0.0-20211022203536-7d47955f01bd
k8s.io/apimachinery v0.0.0-20211022203306-153f11a7f300
k8s.io/client-go v0.0.0-20211022203833-56656ba0e04f
k8s.io/code-generator v0.0.0-20211022203048-1ca1c4b1a3d6
k8s.io/api v0.0.0-20211027003525-5604a481de2c
k8s.io/apimachinery v0.0.0-20211027003259-a39cb4b7e43a
k8s.io/client-go v0.0.0-20211027003826-651ddcb5a2b9
k8s.io/code-generator v0.0.0-20211026222709-e92ab9f4d5a1
k8s.io/klog/v2 v2.30.0
)
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/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/api => k8s.io/api v0.0.0-20211027003525-5604a481de2c
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20211027003259-a39cb4b7e43a
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
)

20
go.sum
View File

@ -74,8 +74,8 @@ github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1m
github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po=
github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/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/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k=
github.com/form3tech-oss/jwt-go v3.2.3+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k=
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
@ -606,14 +606,14 @@ 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/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 h1:DewxcU1y1Kryma574sjAC8LfEzsDA2+BlE4/pazr+TI=
k8s.io/code-generator v0.0.0-20211022203048-1ca1c4b1a3d6/go.mod h1:alK4pz5+y/zKXOPBnND3TvXOC/iF2oYTBDynHO1+qlI=
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/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 h1:Cn80qvXXDyV3KNS/IhXlHG9yHmet2EbJ9t0Mu60QBiQ=
k8s.io/code-generator v0.0.0-20211026222709-e92ab9f4d5a1/go.mod h1:alK4pz5+y/zKXOPBnND3TvXOC/iF2oYTBDynHO1+qlI=
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c h1:GohjlNKauSai7gN4wsJkeZ3WAJx4Sh+oT/b5IYn5suA=
k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=