Merge pull request #93812 from liggitt/json-patch-4.8.0-1.17

[1.17] Update to json-patch 4.8.0

Kubernetes-commit: da707e8b3e96e2f5d91ed474c16c5edde7192bf2
This commit is contained in:
Kubernetes Publisher 2020-08-11 23:57:45 -07:00
parent 15bf6edb65
commit c9d78d2a11
3 changed files with 25 additions and 14 deletions

18
Godeps/Godeps.json generated
View File

@ -80,7 +80,7 @@
},
{
"ImportPath": "github.com/evanphx/json-patch",
"Rev": "v4.2.0"
"Rev": "162e5629780b"
},
{
"ImportPath": "github.com/fsnotify/fsnotify",
@ -182,6 +182,10 @@
"ImportPath": "github.com/imdario/mergo",
"Rev": "v0.3.5"
},
{
"ImportPath": "github.com/jessevdk/go-flags",
"Rev": "v1.4.0"
},
{
"ImportPath": "github.com/json-iterator/go",
"Rev": "v1.1.8"
@ -242,6 +246,10 @@
"ImportPath": "github.com/peterbourgon/diskv",
"Rev": "v2.0.1"
},
{
"ImportPath": "github.com/pkg/errors",
"Rev": "v0.8.1"
},
{
"ImportPath": "github.com/pmezard/go-difflib",
"Rev": "v1.0.0"
@ -372,19 +380,19 @@
},
{
"ImportPath": "k8s.io/api",
"Rev": "41c764546815"
"Rev": "eccf1e78d6cc"
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "891b87d7c4bb"
"Rev": "0d585d148f6f"
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "ad3bb8e4ccf1"
"Rev": "b60a74718804"
},
{
"ImportPath": "k8s.io/code-generator",
"Rev": "c05f3fad9056"
"Rev": "9380d7be9863"
},
{
"ImportPath": "k8s.io/gengo",

17
go.mod
View File

@ -5,19 +5,18 @@ module k8s.io/sample-controller
go 1.12
require (
k8s.io/api v0.0.0
k8s.io/apimachinery v0.0.0
k8s.io/client-go v0.0.0
k8s.io/code-generator v0.0.0
k8s.io/api v0.0.0-20200812091505-eccf1e78d6cc
k8s.io/apimachinery v0.0.0-20200812091329-0d585d148f6f
k8s.io/client-go v0.0.0-20200812091718-b60a74718804
k8s.io/code-generator v0.0.0-20200708122711-9380d7be9863
k8s.io/klog v1.0.0
)
replace (
golang.org/x/sys => golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a // pinned to release-branch.go1.13
golang.org/x/tools => golang.org/x/tools v0.0.0-20190821162956-65e3620a7ae7 // pinned to release-branch.go1.13
k8s.io/api => ../api
k8s.io/apimachinery => ../apimachinery
k8s.io/client-go => ../client-go
k8s.io/code-generator => ../code-generator
k8s.io/sample-controller => ../sample-controller
k8s.io/api => k8s.io/api v0.0.0-20200812091505-eccf1e78d6cc
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200812091329-0d585d148f6f
k8s.io/client-go => k8s.io/client-go v0.0.0-20200812091718-b60a74718804
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20200708122711-9380d7be9863
)

4
go.sum
View File

@ -218,6 +218,10 @@ gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
k8s.io/api v0.0.0-20200812091505-eccf1e78d6cc/go.mod h1:zL6P9z+iLEyWARjxviNQD2Tn4yHkzh+VTKDaGJ36kfc=
k8s.io/apimachinery v0.0.0-20200812091329-0d585d148f6f/go.mod h1:q+iFxLyaMeWIBhSlQ4OMkvdwbwrb8Ux0ALl90XD9paU=
k8s.io/client-go v0.0.0-20200812091718-b60a74718804/go.mod h1:5VF/qK23IpsAVcZxNWTbRg1+t2VtQr6t/fdlL1r2bUY=
k8s.io/code-generator v0.0.0-20200708122711-9380d7be9863/go.mod h1:iiHz51+oTx+Z9D0vB3CH3O4HDDPWrvZyUgUYaIE9h9M=
k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6 h1:4s3/R4+OYYYUKptXPhZKjQ04WJ6EhQQVFdjOFvCazDk=
k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/gengo v0.0.0-20190822140433-26a664648505 h1:ZY6yclUKVbZ+SdWnkfY+Je5vrMpKOxmGeKRbsXVmqYM=