kubernetes
/
apiserver
mirror of https://github.com/kubernetes/apiserver.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
parent 4861eb79d7 0c41e50435
commit b5974fa1ca
3 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Godeps/Godeps.json generated
View File

@ -232,7 +232,7 @@
},
{
"ImportPath": "github.com/evanphx/json-patch",
"Rev": "v4.9.0"
"Rev": "v4.11.0"
},
{
"ImportPath": "github.com/fatih/color",
@ -932,19 +932,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/component-base",
"Rev": "f43a88d7e436"
"Rev": "a36b18ffecae"
},
{
"ImportPath": "k8s.io/gengo",

18
go.mod
View File

@ -12,7 +12,7 @@ require (
github.com/davecgh/go-spew v1.1.1
github.com/dustin/go-humanize v1.0.0 // indirect
github.com/emicklei/go-restful v2.9.5+incompatible
github.com/evanphx/json-patch v4.9.0+incompatible
github.com/evanphx/json-patch v4.11.0+incompatible
github.com/gogo/protobuf v1.3.2
github.com/google/go-cmp v0.5.4
github.com/google/gofuzz v1.1.0
@ -38,10 +38,10 @@ require (
google.golang.org/grpc v1.27.1
gopkg.in/natefinch/lumberjack.v2 v2.0.0
gopkg.in/square/go-jose.v2 v2.2.2
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/component-base v0.0.0-20210604075235-f43a88d7e436
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/component-base v0.0.0-20210604115352-a36b18ffecae
k8s.io/klog/v2 v2.9.0
k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e
k8s.io/utils v0.0.0-20210521133846-da695404a2bc
@ -51,8 +51,8 @@ require (
)
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/component-base => k8s.io/component-base v0.0.0-20210604075235-f43a88d7e436
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/component-base => k8s.io/component-base v0.0.0-20210604115352-a36b18ffecae
)

20
go.sum
View File

@ -103,8 +103,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/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=
@ -695,14 +695,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 h1:sXmLre5bzIR6ypkjXCDI3jHPssRhc8KD/Ome589sc3U=
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/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/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/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/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=