Merge pull request #93810 from liggitt/json-patch-4.8.0

Update to json-patch 4.8.0

Kubernetes-commit: 9b78bd59796d3937986934582230174606403780
This commit is contained in:
Kubernetes Publisher 2020-08-08 12:48:19 -07:00
parent 6283983c53
commit 4134843373
3 changed files with 20 additions and 13 deletions

12
Godeps/Godeps.json generated
View File

@ -128,7 +128,7 @@
},
{
"ImportPath": "github.com/evanphx/json-patch",
"Rev": "e83c0a1c26c8"
"Rev": "162e5629780b"
},
{
"ImportPath": "github.com/fsnotify/fsnotify",
@ -238,6 +238,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.10"
@ -444,15 +448,15 @@
},
{
"ImportPath": "k8s.io/api",
"Rev": "4859c9473977"
"Rev": "a982eb560ae9"
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "945d4ebf362b"
"Rev": "da970ee67a06"
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "6ecbef177593"
"Rev": "9bbcfbab83f6"
},
{
"ImportPath": "k8s.io/code-generator",

17
go.mod
View File

@ -5,17 +5,16 @@ module k8s.io/sample-controller
go 1.15
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-20200808211507-a982eb560ae9
k8s.io/apimachinery v0.0.0-20200808211318-da970ee67a06
k8s.io/client-go v0.0.0-20200808211739-9bbcfbab83f6
k8s.io/code-generator v0.0.0-20200726131043-26c52896b75b
k8s.io/klog/v2 v2.2.0
)
replace (
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-20200808211507-a982eb560ae9
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200808211318-da970ee67a06
k8s.io/client-go => k8s.io/client-go v0.0.0-20200808211739-9bbcfbab83f6
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20200726131043-26c52896b75b
)

4
go.sum
View File

@ -354,6 +354,10 @@ honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWh
honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
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=
k8s.io/api v0.0.0-20200808211507-a982eb560ae9/go.mod h1:D0dJADuMCXgjxg4UaYG8TQtO9YT35ZcOfdyvLjv/oSc=
k8s.io/apimachinery v0.0.0-20200808211318-da970ee67a06/go.mod h1:PDaNuc2kVa6eEsr0Zd3n7+UDnwWc2vQSKszKolx4i8M=
k8s.io/client-go v0.0.0-20200808211739-9bbcfbab83f6/go.mod h1:K9apKx77d2ALpTCifIBUnUMy7wKDyQKWGiaX5MMeJOc=
k8s.io/code-generator v0.0.0-20200726131043-26c52896b75b/go.mod h1:l+Q5vASED8GWxNspCbHMV4q9mcQ6DhLzqwoZhvWz7wU=
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/gengo v0.0.0-20200428234225-8167cfdcfc14 h1:t4L10Qfx/p7ASH3gXCdIUtPbbIuegCoUJf3TMSFekjw=
k8s.io/gengo v0.0.0-20200428234225-8167cfdcfc14/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=