Skip to content

Commit

Permalink
Merge pull request kubernetes#89331 from andyzhangx/automated-cherry-…
Browse files Browse the repository at this point in the history
…pick-of-#89319-upstream-release-1.18

Automated cherry pick of kubernetes#89319: Update vendored MountSensitive code for Windows

Kubernetes-commit: 35d71ed
  • Loading branch information
k8s-publishing-bot committed Mar 21, 2020
1 parent b31a5f3 commit 758a68b
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 20 deletions.
12 changes: 6 additions & 6 deletions Godeps/Godeps.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

27 changes: 13 additions & 14 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,14 @@ require (
golang.org/x/sys v0.0.0-20191022100944-742c48ecaeb7
gopkg.in/yaml.v2 v2.2.8
gotest.tools v2.2.0+incompatible // indirect
k8s.io/api v0.0.0
k8s.io/apimachinery v0.0.0
k8s.io/cli-runtime v0.0.0
k8s.io/client-go v0.0.0
k8s.io/component-base v0.0.0
k8s.io/api v0.0.0-20200316191010-3b4a996260a0
k8s.io/apimachinery v0.0.0-20200308145338-b75c29caafab
k8s.io/cli-runtime v0.0.0-20200321204648-0f7001ef4224
k8s.io/client-go v0.0.0-20200321202708-d0229e78f42c
k8s.io/component-base v0.0.0-20200321203224-02bce613afd1
k8s.io/klog v1.0.0
k8s.io/kube-openapi v0.0.0-20200121204235-bf4fb3bd569c
k8s.io/metrics v0.0.0
k8s.io/metrics v0.0.0-20200321204523-7f42ce0c417d
k8s.io/utils v0.0.0-20200320200009-4a6ff033650d
sigs.k8s.io/kustomize v2.0.3+incompatible
sigs.k8s.io/yaml v1.2.0
Expand All @@ -54,12 +54,11 @@ require (
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/cli-runtime => ../cli-runtime
k8s.io/client-go => ../client-go
k8s.io/code-generator => ../code-generator
k8s.io/component-base => ../component-base
k8s.io/kubectl => ../kubectl
k8s.io/metrics => ../metrics
k8s.io/api => k8s.io/api v0.0.0-20200316191010-3b4a996260a0
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200308145338-b75c29caafab
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20200321204648-0f7001ef4224
k8s.io/client-go => k8s.io/client-go v0.0.0-20200321202708-d0229e78f42c
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20200306170923-c3277d42784b
k8s.io/component-base => k8s.io/component-base v0.0.0-20200321203224-02bce613afd1
k8s.io/metrics => k8s.io/metrics v0.0.0-20200321204523-7f42ce0c417d
)
7 changes: 7 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -306,6 +306,12 @@ gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo=
gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
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-20200316191010-3b4a996260a0/go.mod h1:dQFmApLGF1AzHBoCa9z1a7ftM/1nZEAoknHzuttq6eY=
k8s.io/apimachinery v0.0.0-20200308145338-b75c29caafab/go.mod h1:9SnR/e11v5IbyPCGbvJViimtJ0SwHG4nfZFjU77ftcA=
k8s.io/cli-runtime v0.0.0-20200321204648-0f7001ef4224/go.mod h1:ttrUrx/bVSYwuUiUItOgjJDMTn4pSsIS7HS+yxxHg+I=
k8s.io/client-go v0.0.0-20200321202708-d0229e78f42c/go.mod h1:HvmPqzactXI0oT0IF84wZJkXu7JGUUMmhWyxsvQ97AI=
k8s.io/code-generator v0.0.0-20200306170923-c3277d42784b/go.mod h1:+UHX5rSbxmR8kzS+FAv7um6dtYrZokQvjHpDSYRVkTc=
k8s.io/component-base v0.0.0-20200321203224-02bce613afd1/go.mod h1:WggOlG2MQbhxsXVgCi+EemAA1dNT4hGP6/mBFDU+EUI=
k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/gengo v0.0.0-20200114144118-36b2048a9120/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
Expand All @@ -314,6 +320,7 @@ k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8=
k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I=
k8s.io/kube-openapi v0.0.0-20200121204235-bf4fb3bd569c h1:/KUFqjjqAcY4Us6luF5RDNZ16KJtb49HfR3ZHB9qYXM=
k8s.io/kube-openapi v0.0.0-20200121204235-bf4fb3bd569c/go.mod h1:GRQhZsXIAJ1xR0C9bd8UpWHZ5plfAS9fzPjJuQ6JL3E=
k8s.io/metrics v0.0.0-20200321204523-7f42ce0c417d/go.mod h1:vc56ftU/MkxQ1oH/y/AoDBLZveIHW1gKzDr/O21NNqs=
k8s.io/utils v0.0.0-20200320200009-4a6ff033650d h1:YsO1/5cP8fXBi+ztucS7+f7M/+/jyK8OW5ezxxBjHn4=
k8s.io/utils v0.0.0-20200320200009-4a6ff033650d/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew=
sigs.k8s.io/kustomize v2.0.3+incompatible h1:JUufWFNlI44MdtnjUqVnvh29rR37PQFzPbLXqhyOyX0=
Expand Down

0 comments on commit 758a68b

Please sign in to comment.