From ef93e2e76a5ef3bcdb6ecebee05cd7291402dd0f Mon Sep 17 00:00:00 2001 From: Kubernetes Publisher Date: Fri, 15 Nov 2019 10:10:38 -0800 Subject: [PATCH] Merge pull request #85305 from codenrhoden/remove-mount-pkg Remove pkg/util/mount (moved out of tree) Kubernetes-commit: 45e0080fd5883e3355233c9c22fa5bf242d525dd --- Godeps/Godeps.json | 6 +++--- go.mod | 17 ++++++++--------- go.sum | 4 ++++ 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index c55ea7ef..daef6db7 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -372,7 +372,7 @@ }, { "ImportPath": "k8s.io/api", - "Rev": "da2cf76beda8" + "Rev": "bbc9463b57e5" }, { "ImportPath": "k8s.io/apimachinery", @@ -380,7 +380,7 @@ }, { "ImportPath": "k8s.io/client-go", - "Rev": "6f03b71b98e6" + "Rev": "0a8a1d7b7fae" }, { "ImportPath": "k8s.io/code-generator", @@ -400,7 +400,7 @@ }, { "ImportPath": "k8s.io/utils", - "Rev": "2b95a09bc58d" + "Rev": "e782cd3c129f" }, { "ImportPath": "modernc.org/cc", diff --git a/go.mod b/go.mod index f5594471..c8395187 100644 --- a/go.mod +++ b/go.mod @@ -5,19 +5,18 @@ 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-20191115135540-bbc9463b57e5 + k8s.io/apimachinery v0.0.0-20191115015347-3c7067801da2 + k8s.io/client-go v0.0.0-20191115215802-0a8a1d7b7fae + k8s.io/code-generator v0.0.0-20191114215150-2a85f169f05f 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-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/code-generator => k8s.io/code-generator v0.0.0-20191114215150-2a85f169f05f ) diff --git a/go.sum b/go.sum index 9e7dcf00..77202d26 100644 --- a/go.sum +++ b/go.sum @@ -214,6 +214,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/code-generator v0.0.0-20191114215150-2a85f169f05f/go.mod h1:Vh0irzg7dL9pFS4c8hFsali5txtbmse3MFS4zEH7Thg= 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=