Merge pull request #102467 from pacoxu/json-patch-5.5.0
upgrade json-patch to v4.11.0 Kubernetes-commit: 81b9789eaa7bc067f417b5e74d5695dd6dd88a46
This commit is contained in:
Kubernetes Publisher
commit
a7375dac34
|
|
@ -232,7 +232,7 @@
|
|||
},
|
||||
{
|
||||
"ImportPath": "github.com/evanphx/json-patch",
|
||||
"Rev": "v4.9.0"
|
||||
"Rev": "v4.11.0"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/fatih/color",
|
||||
|
|
@ -932,31 +932,31 @@
|
|||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/api",
|
||||
"Rev": "0b55fc9ab6bb"
|
||||
"Rev": "597d8a9937fd"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery",
|
||||
"Rev": "1e82f3b632c6"
|
||||
"Rev": "aec8116c445f"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apiserver",
|
||||
"Rev": "4861eb79d72f"
|
||||
"Rev": "b5974fa1ca35"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/client-go",
|
||||
"Rev": "2a923d5fc64c"
|
||||
"Rev": "71f81dc71522"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/cloud-provider",
|
||||
"Rev": "bdac1dbfb079"
|
||||
"Rev": "76ea31422598"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/component-base",
|
||||
"Rev": "f43a88d7e436"
|
||||
"Rev": "a36b18ffecae"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/controller-manager",
|
||||
"Rev": "f1bed723dd4c"
|
||||
"Rev": "2c65c810b6b9"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/gengo",
|
||||
|
|
|
|||
20
go.mod
20
go.mod
|
|
@ -5,17 +5,17 @@ module k8s.io/kube-controller-manager
|
|||
go 1.16
|
||||
|
||||
require (
|
||||
k8s.io/apimachinery v0.0.0-20210601194424-1e82f3b632c6
|
||||
k8s.io/cloud-provider v0.0.0-20210604081238-bdac1dbfb079
|
||||
k8s.io/controller-manager v0.0.0-20210604081132-f1bed723dd4c
|
||||
k8s.io/apimachinery v0.0.0-20210604114423-aec8116c445f
|
||||
k8s.io/cloud-provider v0.0.0-20210604121320-76ea31422598
|
||||
k8s.io/controller-manager v0.0.0-20210604121217-2c65c810b6b9
|
||||
)
|
||||
|
||||
replace (
|
||||
k8s.io/api => k8s.io/api v0.0.0-20210601194609-0b55fc9ab6bb
|
||||
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210601194424-1e82f3b632c6
|
||||
k8s.io/apiserver => k8s.io/apiserver v0.0.0-20210604075629-4861eb79d72f
|
||||
k8s.io/client-go => k8s.io/client-go v0.0.0-20210604074848-2a923d5fc64c
|
||||
k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20210604081238-bdac1dbfb079
|
||||
k8s.io/component-base => k8s.io/component-base v0.0.0-20210604075235-f43a88d7e436
|
||||
k8s.io/controller-manager => k8s.io/controller-manager v0.0.0-20210604081132-f1bed723dd4c
|
||||
k8s.io/api => k8s.io/api v0.0.0-20210604114606-597d8a9937fd
|
||||
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210604114423-aec8116c445f
|
||||
k8s.io/apiserver => k8s.io/apiserver v0.0.0-20210604115743-b5974fa1ca35
|
||||
k8s.io/client-go => k8s.io/client-go v0.0.0-20210604114835-71f81dc71522
|
||||
k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20210604121320-76ea31422598
|
||||
k8s.io/component-base => k8s.io/component-base v0.0.0-20210604115352-a36b18ffecae
|
||||
k8s.io/controller-manager => k8s.io/controller-manager v0.0.0-20210604121217-2c65c810b6b9
|
||||
)
|
||||
|
|
|
|||
26
go.sum
26
go.sum
|
|
@ -87,7 +87,7 @@ github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb
|
|||
github.com/emicklei/go-restful v2.9.5+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
|
||||
github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
|
||||
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
|
||||
github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
|
||||
github.com/evanphx/json-patch v4.11.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
|
||||
github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
|
||||
github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k=
|
||||
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
|
||||
|
|
@ -619,18 +619,18 @@ honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWh
|
|||
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
|
||||
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=
|
||||
k8s.io/api v0.0.0-20210601194609-0b55fc9ab6bb h1:bjPb0/AjLmHbYb+sYorOHImcVSqA+dMsHqYjPbfBmNQ=
|
||||
k8s.io/api v0.0.0-20210601194609-0b55fc9ab6bb/go.mod h1:G/aFk75uPvZtPzIzRb9OjwlDQCp9fVTsMnh1+PICcQc=
|
||||
k8s.io/apimachinery v0.0.0-20210601194424-1e82f3b632c6 h1:35RqwIXLWAA4pK39d4FVRKnexm0pPua15G2Aos6hFeg=
|
||||
k8s.io/apimachinery v0.0.0-20210601194424-1e82f3b632c6/go.mod h1:+4qqXWg4CfY9knLAQ+WV7EjNplTpQ0Ima2Q27TU3u+c=
|
||||
k8s.io/apiserver v0.0.0-20210604075629-4861eb79d72f/go.mod h1:myg3nZYuiPNs00E2zezEo3ZeprAPcTUnjl5DJCO0Vhk=
|
||||
k8s.io/client-go v0.0.0-20210604074848-2a923d5fc64c/go.mod h1:b2OOrZSavDcpH/Enp5bEW6JNJnyKo00+8f1jS2gvl8s=
|
||||
k8s.io/cloud-provider v0.0.0-20210604081238-bdac1dbfb079 h1:VCqRmBghq/WiYfyzm/W9ssSxHCC9xF272aYlnWvz3Hk=
|
||||
k8s.io/cloud-provider v0.0.0-20210604081238-bdac1dbfb079/go.mod h1:lKpE0hQ6s8VqcWuWFDEnJjmscWkSlQn9e8xr3zpgIyc=
|
||||
k8s.io/component-base v0.0.0-20210604075235-f43a88d7e436 h1:3e9RIUWBI4hlF+yA/bt3WYSw2whNFvEBL5bDjXQHHN0=
|
||||
k8s.io/component-base v0.0.0-20210604075235-f43a88d7e436/go.mod h1:q4xU8PZ5HGbR87UI7OPWBN1epKNk5tf8RSA7Zrhjrr0=
|
||||
k8s.io/controller-manager v0.0.0-20210604081132-f1bed723dd4c h1:r+Xbxntz2KuCSV0zwwHMTnCgASUICBXIxQWgPFoI5Lo=
|
||||
k8s.io/controller-manager v0.0.0-20210604081132-f1bed723dd4c/go.mod h1:gQ2XNc86esRV76AuSK3g719WQHr1IRq0/O74movAjm0=
|
||||
k8s.io/api v0.0.0-20210604114606-597d8a9937fd h1:Zl0QbEdpIgO6ZWwL9Sp8I3VuMkmHZ74wNppSQMAPnTE=
|
||||
k8s.io/api v0.0.0-20210604114606-597d8a9937fd/go.mod h1:Dc7D5FRyGPPWEZ/WG9X2TOU/beNMsO3+S+lU1bhmKwo=
|
||||
k8s.io/apimachinery v0.0.0-20210604114423-aec8116c445f h1:DmoZH3nTdy0sXQ7iZ6Gd3b2DjLiCC8d2nWTLojwU7k4=
|
||||
k8s.io/apimachinery v0.0.0-20210604114423-aec8116c445f/go.mod h1:5zcgojGmAy5Bo3S4mgZWAt6HwoKzaSh4MV3ITvlcOVM=
|
||||
k8s.io/apiserver v0.0.0-20210604115743-b5974fa1ca35/go.mod h1:lXu8ezq7jcLDZYLec18G3SLfpfRNR4XKkV+XI+miDlY=
|
||||
k8s.io/client-go v0.0.0-20210604114835-71f81dc71522/go.mod h1:OjmCoE7ifKXyCDHTOqW9Tt2Knriz/Ah8IkpJXA8Ux5c=
|
||||
k8s.io/cloud-provider v0.0.0-20210604121320-76ea31422598 h1:wb6D27cnYlnfNkfnWA/DtJE1ieFdmescg6zB13WmWfs=
|
||||
k8s.io/cloud-provider v0.0.0-20210604121320-76ea31422598/go.mod h1:xgg2g9qMDzgMcCx9Je/33JxzXRPEnWeMfqSvLf5UTTs=
|
||||
k8s.io/component-base v0.0.0-20210604115352-a36b18ffecae h1:SrR3cXX+c4s3cGT2WPAM99/fGaeB9V1iR833PMNogsg=
|
||||
k8s.io/component-base v0.0.0-20210604115352-a36b18ffecae/go.mod h1:oPR2PvsBptV/gMBmL6av4Ss+EGA7ctjVPZ+B+NEhhko=
|
||||
k8s.io/controller-manager v0.0.0-20210604121217-2c65c810b6b9 h1:T5ujBPpEigZIFoOsyoAtBspX9lS8luXgHdwAAzlU430=
|
||||
k8s.io/controller-manager v0.0.0-20210604121217-2c65c810b6b9/go.mod h1:yQglRfdAT8ROLDjlz1Mx5mZf2gaAJwO9sWV4koMYpVo=
|
||||
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.9.0 h1:D7HV+n1V57XeZ0m6tdRkfknthUaM06VFbWldOFh8kzM=
|
||||
|
|
|
|||
Loading…
Reference in New Issue