Merge pull request #77753 from liggitt/prune-replace

Prune matching replace directives in staging repos more effectively

Kubernetes-commit: 6f6890b09e2a8ae7eaaea0a5052d45c3960e1c76
This commit is contained in:
Kubernetes Publisher 2019-05-10 19:28:48 -07:00
parent aa060187a6
commit 0d5581c413
3 changed files with 18 additions and 13 deletions

8
Godeps/Godeps.json generated
View File

@ -212,19 +212,19 @@
},
{
"ImportPath": "k8s.io/api",
"Rev": "181e1f9c52c1"
"Rev": "e63b5755afac"
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "17f84483f500"
"Rev": "ad85901afca0"
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "65184652c889"
"Rev": "c6f3777976ad"
},
{
"ImportPath": "k8s.io/code-generator",
"Rev": "ff26e7842f9d"
"Rev": "639c964206c2"
},
{
"ImportPath": "k8s.io/gengo",

19
go.mod
View File

@ -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-20190511023547-e63b5755afac
k8s.io/apimachinery v0.0.0-20190511023455-ad85901afca0
k8s.io/client-go v0.0.0-20190511023711-c6f3777976ad
k8s.io/code-generator v0.0.0-20190511023357-639c964206c2
k8s.io/klog v0.3.0
)
@ -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-20190511023547-e63b5755afac
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190511023455-ad85901afca0
k8s.io/client-go => k8s.io/client-go v0.0.0-20190511023711-c6f3777976ad
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20190511023357-639c964206c2
)
replace k8s.io/component-base => k8s.io/component-base v0.0.0-20190511024024-91ee9e34fdd1

4
go.sum
View File

@ -92,6 +92,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-20190511023547-e63b5755afac/go.mod h1:f265Ep4XvHtyggfaaNhtP0AtAFilBaXq2fPjm5kYxwI=
k8s.io/apimachinery v0.0.0-20190511023455-ad85901afca0/go.mod h1:5CBnzrKYGHzv9ZsSKmQ8wHt4XI4/TUBPDwYM9FlZMyw=
k8s.io/client-go v0.0.0-20190511023711-c6f3777976ad/go.mod h1:+kqLjErve3/VoGTdnrw4Lu8D315nxEVQs1QEq8/uJ2E=
k8s.io/code-generator v0.0.0-20190511023357-639c964206c2/go.mod h1:YMQ7Lt97nW/I6nHACDccgS/sPAyrHQNans96RwPaSb8=
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.0 h1:0VPpR+sizsiivjIfIAQH/rl8tan6jvWkS7lU+0di3lE=