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.15. Deleting CHANGELOG-1.14.md
Kubernetes-commit: 5991262b24f5e834654716148c939624536cce3a
This commit is contained in:
parent
282a604802
commit
01c477d05a
10
Godeps/Godeps.json
generated
10
Godeps/Godeps.json
generated
@ -216,19 +216,19 @@
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/api",
|
||||
"Rev": "c7696f7b6340"
|
||||
"Rev": "576cfa93bfcf"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery",
|
||||
"Rev": "3f1c30e3430c"
|
||||
"Rev": "587ae2000094"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/client-go",
|
||||
"Rev": "c42884485225"
|
||||
"Rev": "1d2c64df009d"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/code-generator",
|
||||
"Rev": "c86a2ce2ce0f"
|
||||
"Rev": "a9f578f3d62a"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/gengo",
|
||||
@ -236,7 +236,7 @@
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/klog",
|
||||
"Rev": "v0.3.0"
|
||||
"Rev": "v0.3.1"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/kube-openapi",
|
||||
|
19
go.mod
19
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-20190528154556-576cfa93bfcf
|
||||
k8s.io/apimachinery v0.0.0-20190528154421-587ae2000094
|
||||
k8s.io/client-go v0.0.0-20190523093902-1d2c64df009d
|
||||
k8s.io/code-generator v0.0.0-20190528154225-a9f578f3d62a
|
||||
k8s.io/klog v0.3.1
|
||||
)
|
||||
|
||||
@ -16,9 +16,10 @@ replace (
|
||||
golang.org/x/sync => golang.org/x/sync v0.0.0-20181108010431-42b317875d0f
|
||||
golang.org/x/sys => golang.org/x/sys v0.0.0-20190209173611-3b5209105503
|
||||
golang.org/x/tools => golang.org/x/tools v0.0.0-20190313210603-aa82965741a9
|
||||
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-20190528154556-576cfa93bfcf
|
||||
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190528154421-587ae2000094
|
||||
k8s.io/client-go => k8s.io/client-go v0.0.0-20190523093902-1d2c64df009d
|
||||
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20190528154225-a9f578f3d62a
|
||||
)
|
||||
|
||||
replace k8s.io/component-base => k8s.io/component-base v0.0.0-20190528155601-e3d0eeb0e901
|
||||
|
4
go.sum
4
go.sum
@ -94,6 +94,10 @@ gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkep
|
||||
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
|
||||
gopkg.in/yaml.v2 v2.2.1 h1:mUhvW9EsL+naU5Q3cakzfE91YhliOondGd6ZrsDBHQE=
|
||||
gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
|
||||
k8s.io/api v0.0.0-20190528154556-576cfa93bfcf/go.mod h1:kSN4o7sxlIvlMOEe8JbQDVmC4xvMyyK0eQpOLHALC8U=
|
||||
k8s.io/apimachinery v0.0.0-20190528154421-587ae2000094/go.mod h1:I4A+glKBHiTgiEjQiCCQfCAIcIMFGt291SmsvcrFzJA=
|
||||
k8s.io/client-go v0.0.0-20190523093902-1d2c64df009d/go.mod h1:/Ahf09gdt+vQvYeMQAjgY/PtbXcs13ZA50q+WLPnF2o=
|
||||
k8s.io/code-generator v0.0.0-20190528154225-a9f578f3d62a/go.mod h1:G8bQwmHm2eafm5bgtX67XDZQ8CWKSGu9DekI+yN4Y5I=
|
||||
k8s.io/gengo v0.0.0-20190116091435-f8a0810f38af h1:SwjZbO0u5ZuaV6TRMWOGB40iaycX8sbdMQHtjNZ19dk=
|
||||
k8s.io/gengo v0.0.0-20190116091435-f8a0810f38af/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
|
||||
k8s.io/klog v0.3.1 h1:RVgyDHY/kFKtLqh67NvEWIgkMneNoIrdkN0CxDSQc68=
|
||||
|
Loading…
x
Reference in New Issue
Block a user