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 2021-06-04 01:21:26 -07:00
commit 3f407ea648
3 changed files with 23 additions and 23 deletions

10
Godeps/Godeps.json generated
View File

@ -132,7 +132,7 @@
},
{
"ImportPath": "github.com/evanphx/json-patch",
"Rev": "v4.9.0"
"Rev": "v4.11.0"
},
{
"ImportPath": "github.com/form3tech-oss/jwt-go",
@ -480,19 +480,19 @@
},
{
"ImportPath": "k8s.io/api",
"Rev": "0b55fc9ab6bb"
"Rev": "597d8a9937fd"
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "1e82f3b632c6"
"Rev": "aec8116c445f"
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "2a923d5fc64c"
"Rev": "71f81dc71522"
},
{
"ImportPath": "k8s.io/code-generator",
"Rev": "daefbeda97a9"
"Rev": "ed0f8d04eed3"
},
{
"ImportPath": "k8s.io/gengo",

16
go.mod
View File

@ -5,16 +5,16 @@ module k8s.io/sample-controller
go 1.16
require (
k8s.io/api v0.0.0-20210601194609-0b55fc9ab6bb
k8s.io/apimachinery v0.0.0-20210601194424-1e82f3b632c6
k8s.io/client-go v0.0.0-20210604074848-2a923d5fc64c
k8s.io/code-generator v0.0.0-20210604074252-daefbeda97a9
k8s.io/api v0.0.0-20210604114606-597d8a9937fd
k8s.io/apimachinery v0.0.0-20210604114423-aec8116c445f
k8s.io/client-go v0.0.0-20210604114835-71f81dc71522
k8s.io/code-generator v0.0.0-20210604114248-ed0f8d04eed3
k8s.io/klog/v2 v2.9.0
)
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/client-go => k8s.io/client-go v0.0.0-20210604074848-2a923d5fc64c
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20210604074252-daefbeda97a9
k8s.io/api => k8s.io/api v0.0.0-20210604114606-597d8a9937fd
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210604114423-aec8116c445f
k8s.io/client-go => k8s.io/client-go v0.0.0-20210604114835-71f81dc71522
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20210604114248-ed0f8d04eed3
)

20
go.sum
View File

@ -53,8 +53,8 @@ github.com/emicklei/go-restful v2.9.5+incompatible h1:spTtZBk5DYEvbxMVutUuTyh1Ao
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 h1:kLcOMZeuLAJvL2BPWLMIj5oaZQobrkAqrL+WFZwQses=
github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
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/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=
github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
@ -438,14 +438,14 @@ 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/client-go v0.0.0-20210604074848-2a923d5fc64c h1:FBtlQ+V3SYiId4WWBAZob0vNQvi5PSW5jEQ4EIIXGxY=
k8s.io/client-go v0.0.0-20210604074848-2a923d5fc64c/go.mod h1:b2OOrZSavDcpH/Enp5bEW6JNJnyKo00+8f1jS2gvl8s=
k8s.io/code-generator v0.0.0-20210604074252-daefbeda97a9 h1:qM2ISnZQEWlHwongKghZCx2Wu/awLH7UFIMMPu0TFpI=
k8s.io/code-generator v0.0.0-20210604074252-daefbeda97a9/go.mod h1:FSpIt1knsWe0QNfwrAq7+M1/AhwWXHWKjsbbfeeW+N4=
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/client-go v0.0.0-20210604114835-71f81dc71522 h1:ZunT82NYTfLqhtJsR6AAsPNcTi+wKVZq0WPapAO1rh4=
k8s.io/client-go v0.0.0-20210604114835-71f81dc71522/go.mod h1:OjmCoE7ifKXyCDHTOqW9Tt2Knriz/Ah8IkpJXA8Ux5c=
k8s.io/code-generator v0.0.0-20210604114248-ed0f8d04eed3 h1:CMlcgVVxnLEgTwpoV/VWvTjDSZyah18+iWqf9sJMOx8=
k8s.io/code-generator v0.0.0-20210604114248-ed0f8d04eed3/go.mod h1:FSpIt1knsWe0QNfwrAq7+M1/AhwWXHWKjsbbfeeW+N4=
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027 h1:Uusb3oh8XcdzDF/ndlI4ToKTYVlkCSJP39SRY2mfRAw=
k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=