Merge pull request #89319 from mboersma/fix-mount-sensitive-windows-master

Update vendored MountSensitive code for Windows

Kubernetes-commit: ca82b3281f426add48421aa54114d8f54f7d4ce5
This commit is contained in:
Kubernetes Publisher 2020-03-21 08:28:44 -07:00
parent a471136fa4
commit 3bff4f1e4d
3 changed files with 16 additions and 13 deletions

8
Godeps/Godeps.json generated
View File

@ -344,15 +344,15 @@
}, },
{ {
"ImportPath": "k8s.io/api", "ImportPath": "k8s.io/api",
"Rev": "eb909d5fe0e7" "Rev": "1fc28ea2498c"
}, },
{ {
"ImportPath": "k8s.io/apimachinery", "ImportPath": "k8s.io/apimachinery",
"Rev": "147abd67b880" "Rev": "48159c651603"
}, },
{ {
"ImportPath": "k8s.io/client-go", "ImportPath": "k8s.io/client-go",
"Rev": "365234d2fcf0" "Rev": "b8fba595e8fa"
}, },
{ {
"ImportPath": "k8s.io/code-generator", "ImportPath": "k8s.io/code-generator",
@ -372,7 +372,7 @@
}, },
{ {
"ImportPath": "k8s.io/utils", "ImportPath": "k8s.io/utils",
"Rev": "0a110f9eb7ab" "Rev": "4a6ff033650d"
}, },
{ {
"ImportPath": "sigs.k8s.io/structured-merge-diff/v3", "ImportPath": "sigs.k8s.io/structured-merge-diff/v3",

17
go.mod
View File

@ -5,19 +5,18 @@ module k8s.io/sample-controller
go 1.13 go 1.13
require ( require (
k8s.io/api v0.0.0 k8s.io/api v0.0.0-20200320042356-1fc28ea2498c
k8s.io/apimachinery v0.0.0 k8s.io/apimachinery v0.0.0-20200320122144-48159c651603
k8s.io/client-go v0.0.0 k8s.io/client-go v0.0.0-20200321162612-b8fba595e8fa
k8s.io/code-generator v0.0.0 k8s.io/code-generator v0.0.0-20200319201949-6bb2b634cece
k8s.io/klog v1.0.0 k8s.io/klog v1.0.0
) )
replace ( replace (
golang.org/x/sys => golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a // pinned to release-branch.go1.13 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 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/api => k8s.io/api v0.0.0-20200320042356-1fc28ea2498c
k8s.io/apimachinery => ../apimachinery k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200320122144-48159c651603
k8s.io/client-go => ../client-go k8s.io/client-go => k8s.io/client-go v0.0.0-20200321162612-b8fba595e8fa
k8s.io/code-generator => ../code-generator k8s.io/code-generator => k8s.io/code-generator v0.0.0-20200319201949-6bb2b634cece
k8s.io/sample-controller => ../sample-controller
) )

4
go.sum
View File

@ -198,6 +198,10 @@ gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/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-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/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-20200320042356-1fc28ea2498c/go.mod h1:5nMyHS4bWX496fulniJ+Sws3P6GLvaP43GadMObLf58=
k8s.io/apimachinery v0.0.0-20200320122144-48159c651603/go.mod h1:yKN3QjQfKl8UdUL9RQ+/1VkR7nIUs7w02zC5CXhD+G0=
k8s.io/client-go v0.0.0-20200321162612-b8fba595e8fa/go.mod h1:QkKUlGfqNhbWJpIdmVeFFIWa8eGjPJEzy7d04wOuXxg=
k8s.io/code-generator v0.0.0-20200319201949-6bb2b634cece/go.mod h1:HgVCDA66DadRZIO1Ym1MX49lfUdXKOzJ8HA7GQVQTMI=
k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/gengo v0.0.0-20200114144118-36b2048a9120 h1:RPscN6KhmG54S33L+lr3GS+oD1jmchIU0ll519K6FA4= k8s.io/gengo v0.0.0-20200114144118-36b2048a9120 h1:RPscN6KhmG54S33L+lr3GS+oD1jmchIU0ll519K6FA4=
k8s.io/gengo v0.0.0-20200114144118-36b2048a9120/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20200114144118-36b2048a9120/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=