github/sample-controller
github/sample-controller
4
0
Fork 0
mirror of https://github.com/kubernetes/sample-controller.git synced 2025-05-12 17:51:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #93811 from liggitt/json-patch-4.8.0-1.18

Browse Source 
[1.18] Update to json-patch 4.8.0

Kubernetes-commit: 7914bac28a993d4493e0c1e31323bb9330dbdcf6
This commit is contained in:
Kubernetes Publisher 2020-08-11 19:19:45 -07:00
parent a73c22ff8c
commit 5c2f92ef30
3 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Godeps/Godeps.json generated
View File

@ -76,7 +76,7 @@
}, },
{ {
"ImportPath": "github.com/evanphx/json-patch", "ImportPath": "github.com/evanphx/json-patch",
"Rev": "v4.2.0" "Rev": "162e5629780b"
}, },
{ {
"ImportPath": "github.com/fsnotify/fsnotify", "ImportPath": "github.com/fsnotify/fsnotify",
@ -178,6 +178,10 @@
"ImportPath": "github.com/imdario/mergo", "ImportPath": "github.com/imdario/mergo",
"Rev": "v0.3.5" "Rev": "v0.3.5"
}, },
{
"ImportPath": "github.com/jessevdk/go-flags",
"Rev": "v1.4.0"
},
{ {
"ImportPath": "github.com/json-iterator/go", "ImportPath": "github.com/json-iterator/go",
"Rev": "v1.1.8" "Rev": "v1.1.8"
@ -238,6 +242,10 @@
"ImportPath": "github.com/peterbourgon/diskv", "ImportPath": "github.com/peterbourgon/diskv",
"Rev": "v2.0.1" "Rev": "v2.0.1"
}, },
{
"ImportPath": "github.com/pkg/errors",
"Rev": "v0.8.1"
},
{ {
"ImportPath": "github.com/pmezard/go-difflib", "ImportPath": "github.com/pmezard/go-difflib",
"Rev": "v1.0.0" "Rev": "v1.0.0"
@ -348,19 +356,19 @@
}, },
{ {
"ImportPath": "k8s.io/api", "ImportPath": "k8s.io/api",
"Rev": "1b2a9461f0df" "Rev": "e70c4f3b2093"
}, },
{ {
"ImportPath": "k8s.io/apimachinery", "ImportPath": "k8s.io/apimachinery",
"Rev": "6f2abe07e083" "Rev": "2a282836017b"
}, },
{ {
"ImportPath": "k8s.io/client-go", "ImportPath": "k8s.io/client-go",
"Rev": "7b592a8174df" "Rev": "c8494005d10a"
}, },
{ {
"ImportPath": "k8s.io/code-generator", "ImportPath": "k8s.io/code-generator",
"Rev": "67238afd2e27" "Rev": "f186a36abf5c"
}, },
{ {
"ImportPath": "k8s.io/gengo", "ImportPath": "k8s.io/gengo",

17
go.mod
View File

@ -5,19 +5,18 @@ module k8s.io/sample-controller
go 1.13 go 1.13
require ( require (
k8s.io/api v0.0.0 k8s.io/api v0.0.0-20200812052025-e70c4f3b2093
k8s.io/apimachinery v0.0.0 k8s.io/apimachinery v0.0.0-20200812051649-2a282836017b
k8s.io/client-go v0.0.0 k8s.io/client-go v0.0.0-20200812053003-c8494005d10a
k8s.io/code-generator v0.0.0 k8s.io/code-generator v0.0.0-20200708172309-f186a36abf5c
k8s.io/klog v1.0.0 k8s.io/klog v1.0.0
) )
replace ( replace (
golang.org/x/sys => golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a // pinned to release-branch.go1.13 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 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/api => k8s.io/api v0.0.0-20200812052025-e70c4f3b2093
k8s.io/apimachinery => ../apimachinery k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200812051649-2a282836017b
k8s.io/client-go => ../client-go k8s.io/client-go => k8s.io/client-go v0.0.0-20200812053003-c8494005d10a
k8s.io/code-generator => ../code-generator k8s.io/code-generator => k8s.io/code-generator v0.0.0-20200708172309-f186a36abf5c
k8s.io/sample-controller => ../sample-controller
) )

4
go.sum
View File

@ -198,6 +198,10 @@ gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= 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-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/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-20200812052025-e70c4f3b2093/go.mod h1:MPNnU4pTjzYeFpTSSpWzFiUBRuHB2vtcdUJb5Nn39oA=
k8s.io/apimachinery v0.0.0-20200812051649-2a282836017b/go.mod h1:6sQd+iHEqmOtALqOFjSWp2KZ9F0wlU/nWm0ZgsYWMig=
k8s.io/client-go v0.0.0-20200812053003-c8494005d10a/go.mod h1:OvvlQiEBtKyxjiWi0KJ+aZ1f9I7cE/1RuhQ1+sjsJTc=
k8s.io/code-generator v0.0.0-20200708172309-f186a36abf5c/go.mod h1:TgNEVx9hCyPGpdtCWA34olQYLkh3ok9ar7XfSsr8b6c=
k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/gengo v0.0.0-20200114144118-36b2048a9120 h1:RPscN6KhmG54S33L+lr3GS+oD1jmchIU0ll519K6FA4= k8s.io/gengo v0.0.0-20200114144118-36b2048a9120 h1:RPscN6KhmG54S33L+lr3GS+oD1jmchIU0ll519K6FA4=
k8s.io/gengo v0.0.0-20200114144118-36b2048a9120/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20200114144118-36b2048a9120/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=