mirror of
https://github.com/kubernetes/sample-controller.git
synced 2025-03-31 19:58:45 +08:00
Merge remote-tracking branch 'origin/master' into release-1.17
Kubernetes-commit: 1aae77adac170f7eb3d2281c9a56db4ad9ee60ac
This commit is contained in:
parent
f7aefcc27e
commit
fb3f879b30
10
Godeps/Godeps.json
generated
10
Godeps/Godeps.json
generated
@ -368,19 +368,19 @@
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/api",
|
||||
"Rev": "5524a3672fbb"
|
||||
"Rev": "0fe51414ed68"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery",
|
||||
"Rev": "af6325b3a843"
|
||||
"Rev": "650de2ebb2e8"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/client-go",
|
||||
"Rev": "af0e48646694"
|
||||
"Rev": "60db0a7b4e4d"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/code-generator",
|
||||
"Rev": "fb66f1f7eb3c"
|
||||
"Rev": "cfc5e45aeb0c"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/gengo",
|
||||
@ -396,7 +396,7 @@
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/utils",
|
||||
"Rev": "8d271d903fe4"
|
||||
"Rev": "2b95a09bc58d"
|
||||
},
|
||||
{
|
||||
"ImportPath": "modernc.org/cc",
|
||||
|
17
go.mod
17
go.mod
@ -5,10 +5,10 @@ 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-20191104115250-0fe51414ed68
|
||||
k8s.io/apimachinery v0.0.0-20191104115250-650de2ebb2e8
|
||||
k8s.io/client-go v0.0.0-20191104115250-60db0a7b4e4d
|
||||
k8s.io/code-generator v0.0.0-20191031101217-cfc5e45aeb0c
|
||||
k8s.io/klog v1.0.0
|
||||
)
|
||||
|
||||
@ -21,9 +21,8 @@ replace (
|
||||
golang.org/x/sys => golang.org/x/sys v0.0.0-20190209173611-3b5209105503
|
||||
golang.org/x/text => golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db
|
||||
golang.org/x/time => golang.org/x/time v0.0.0-20161028155119-f51c12702a4d
|
||||
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-20191104115250-0fe51414ed68
|
||||
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20191104115250-650de2ebb2e8
|
||||
k8s.io/client-go => k8s.io/client-go v0.0.0-20191104115250-60db0a7b4e4d
|
||||
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20191031101217-cfc5e45aeb0c
|
||||
)
|
||||
|
4
go.sum
4
go.sum
@ -192,6 +192,10 @@ gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I=
|
||||
gopkg.in/yaml.v2 v2.2.4/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-20191104115250-0fe51414ed68/go.mod h1:RW+sC6+W5IPfSGcbw9LDpuQN0GcDTl6S8zkZKASE7FI=
|
||||
k8s.io/apimachinery v0.0.0-20191104115250-650de2ebb2e8/go.mod h1:gA1T9z4LIup7PIegBwxkF2UYXUNVKhOAPvQWWnAc34k=
|
||||
k8s.io/client-go v0.0.0-20191104115250-60db0a7b4e4d/go.mod h1:AwNf1u2mt4c46aqNLcNY59DhKPUE8tdCepPgB9XzmHs=
|
||||
k8s.io/code-generator v0.0.0-20191031101217-cfc5e45aeb0c/go.mod h1:HtDEU3n5Xo1vbwjXWiJ/lFNb5r6BWBz6aZU1IZTr4eA=
|
||||
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=
|
||||
|
Loading…
x
Reference in New Issue
Block a user