Merge pull request #85305 from codenrhoden/remove-mount-pkg

Remove pkg/util/mount (moved out of tree)

Kubernetes-commit: 45e0080fd5883e3355233c9c22fa5bf242d525dd
This commit is contained in:
Kubernetes Publisher 2019-11-15 10:10:38 -08:00
parent 5b3fbc7b89
commit db89989543
3 changed files with 15 additions and 12 deletions

10
Godeps/Godeps.json generated
View File

@ -424,19 +424,19 @@
},
{
"ImportPath": "k8s.io/api",
"Rev": "6cd33094d465"
"Rev": "bbc9463b57e5"
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "67a48e0c9266"
"Rev": "3c7067801da2"
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "6f03b71b98e6"
"Rev": "0a8a1d7b7fae"
},
{
"ImportPath": "k8s.io/component-base",
"Rev": "90a8a7f61617"
"Rev": "ea09a2678486"
},
{
"ImportPath": "k8s.io/gengo",
@ -452,7 +452,7 @@
},
{
"ImportPath": "k8s.io/utils",
"Rev": "2b95a09bc58d"
"Rev": "e782cd3c129f"
},
{
"ImportPath": "sigs.k8s.io/structured-merge-diff",

13
go.mod
View File

@ -5,16 +5,15 @@ module k8s.io/kube-proxy
go 1.12
require (
k8s.io/apimachinery v0.0.0
k8s.io/component-base v0.0.0
k8s.io/apimachinery v0.0.0-20191115015347-3c7067801da2
k8s.io/component-base v0.0.0-20191115220130-ea09a2678486
)
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/component-base => ../component-base
k8s.io/kube-proxy => ../kube-proxy
k8s.io/api => k8s.io/api v0.0.0-20191115135540-bbc9463b57e5
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20191115015347-3c7067801da2
k8s.io/client-go => k8s.io/client-go v0.0.0-20191115215802-0a8a1d7b7fae
k8s.io/component-base => k8s.io/component-base v0.0.0-20191115220130-ea09a2678486
)

4
go.sum
View File

@ -186,6 +186,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-20191115135540-bbc9463b57e5/go.mod h1:iA/8arsvelvo4IDqIhX4IbjTEKBGgvsf2OraTuRtLFU=
k8s.io/apimachinery v0.0.0-20191115015347-3c7067801da2/go.mod h1:dXFS2zaQR8fyzuvRdJDHw2Aerij/yVGJSre0bZQSVJA=
k8s.io/client-go v0.0.0-20191115215802-0a8a1d7b7fae/go.mod h1:TbGggIs7DWyrkTU4rISraGSVNs8I5exBipElTA640Dw=
k8s.io/component-base v0.0.0-20191115220130-ea09a2678486/go.mod h1:sor/ubUgFIRvzB25EqMKp20Zx76oVgpBrao3RQhjSHE=
k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=