mirror of
https://github.com/kubernetes/sample-controller.git
synced 2025-04-22 20:20:44 +08:00
Merge pull request #94148 from liggitt/json-patch-1.18
[1.18] Update to json-patch 4.9.0 Kubernetes-commit: 62eff8d42cff51ddab6ef3c5b3f7380a5c02815f
This commit is contained in:
parent
9efa6c0104
commit
d979ba3a78
12
Godeps/Godeps.json
generated
12
Godeps/Godeps.json
generated
@ -76,7 +76,7 @@
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/evanphx/json-patch",
|
||||
"Rev": "162e5629780b"
|
||||
"Rev": "v4.9.0"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/fsnotify/fsnotify",
|
||||
@ -178,10 +178,6 @@
|
||||
"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"
|
||||
@ -356,15 +352,15 @@
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/api",
|
||||
"Rev": "e70c4f3b2093"
|
||||
"Rev": "4352ece35dc9"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery",
|
||||
"Rev": "2a282836017b"
|
||||
"Rev": "1a4218b8b919"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/client-go",
|
||||
"Rev": "c8494005d10a"
|
||||
"Rev": "82b9b1a14664"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/code-generator",
|
||||
|
17
go.mod
17
go.mod
@ -5,19 +5,18 @@ module k8s.io/sample-controller
|
||||
go 1.13
|
||||
|
||||
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-20200903132205-4352ece35dc9
|
||||
k8s.io/apimachinery v0.0.0-20200903131814-1a4218b8b919
|
||||
k8s.io/client-go v0.0.0-20200903133201-82b9b1a14664
|
||||
k8s.io/code-generator v0.0.0-20200708172309-f186a36abf5c
|
||||
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-20200903132205-4352ece35dc9
|
||||
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200903131814-1a4218b8b919
|
||||
k8s.io/client-go => k8s.io/client-go v0.0.0-20200903133201-82b9b1a14664
|
||||
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20200708172309-f186a36abf5c
|
||||
)
|
||||
|
4
go.sum
4
go.sum
@ -197,6 +197,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-20200903132205-4352ece35dc9/go.mod h1:pfD5vQS9vnO4IDjaPeU+KovTfbFrRz2VKg7/PvdLUS0=
|
||||
k8s.io/apimachinery v0.0.0-20200903131814-1a4218b8b919/go.mod h1:PF5taHbXgTEJLU+xMypMmYTXTWPJ5LaW8bfsisxnEXk=
|
||||
k8s.io/client-go v0.0.0-20200903133201-82b9b1a14664/go.mod h1:D3dxumZbrEHqZzOrC9BzR5xjcr8CT90zel1uVLVs528=
|
||||
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-20200114144118-36b2048a9120 h1:RPscN6KhmG54S33L+lr3GS+oD1jmchIU0ll519K6FA4=
|
||||
k8s.io/gengo v0.0.0-20200114144118-36b2048a9120/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
|
||||
|
Loading…
x
Reference in New Issue
Block a user