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 7fc3131dba
commit 8de8e0ab9d
2 changed files with 22 additions and 11 deletions

21
go.mod
View File

@ -5,18 +5,17 @@ module k8s.io/kube-controller-manager
go 1.16
require (
k8s.io/apimachinery v0.0.0
k8s.io/cloud-provider v0.0.0
k8s.io/controller-manager v0.0.0
k8s.io/apimachinery v0.0.0-20211027003259-a39cb4b7e43a
k8s.io/cloud-provider v0.0.0-20211027010539-e820ef550eff
k8s.io/controller-manager v0.0.0-20211027010429-6c1c2eb1f62e
)
replace (
k8s.io/api => ../api
k8s.io/apimachinery => ../apimachinery
k8s.io/apiserver => ../apiserver
k8s.io/client-go => ../client-go
k8s.io/cloud-provider => ../cloud-provider
k8s.io/component-base => ../component-base
k8s.io/controller-manager => ../controller-manager
k8s.io/kube-controller-manager => ../kube-controller-manager
k8s.io/api => k8s.io/api v0.0.0-20211027003525-5604a481de2c
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20211027003259-a39cb4b7e43a
k8s.io/apiserver => k8s.io/apiserver v0.0.0-20211027004858-bd2365e2f0af
k8s.io/client-go => k8s.io/client-go v0.0.0-20211027003826-651ddcb5a2b9
k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20211027010539-e820ef550eff
k8s.io/component-base => k8s.io/component-base v0.0.0-20211027004438-bd08cb7812c3
k8s.io/controller-manager => k8s.io/controller-manager v0.0.0-20211027010429-6c1c2eb1f62e
)

12
go.sum
View File

@ -846,6 +846,18 @@ 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/apiserver v0.0.0-20211027004858-bd2365e2f0af/go.mod h1:PN5jFrvVbMI/BumZK7OYy6A0tAFg1USEMEZWSmyo8Ms=
k8s.io/client-go v0.0.0-20211027003826-651ddcb5a2b9/go.mod h1:lpux6w9aCpaOS5nNGODOQWjXfju0jAj9vNVDqK6AoTw=
k8s.io/cloud-provider v0.0.0-20211027010539-e820ef550eff h1:KapNEj9XbuxdKLkUaGVf90u5bsjeRXDfHDnc645xZ6Y=
k8s.io/cloud-provider v0.0.0-20211027010539-e820ef550eff/go.mod h1:MbtX+HH+g4+WeAYV/If4nbQcI59shCrzIK/bNeZkzvE=
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/controller-manager v0.0.0-20211027010429-6c1c2eb1f62e h1:tueKCyePXnhkKThonsBgo0rEqMEZNnYKwLyVkCD/6Z8=
k8s.io/controller-manager v0.0.0-20211027010429-6c1c2eb1f62e/go.mod h1:UKJRRSfED+A9EnoO/rFQavo+TTUw+clQhrsUuSUav3k=
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=