Skip to content

Commit

Permalink
WIP: Use updated CSINodeInfo
Browse files Browse the repository at this point in the history
This PR uses updated CSINodeInfo. It is a temporary fix until
vendor files are updated properly. Update to K8S v1.13.0-beta.1
is dependent on the dependencies in kubernetes-csi-migration-library.

Fixes: kubernetes-csi#99
  • Loading branch information
xing-yang committed Nov 25, 2018
1 parent 0b6bb40 commit 72143d9
Show file tree
Hide file tree
Showing 21 changed files with 647 additions and 24 deletions.
4 changes: 2 additions & 2 deletions pkg/controller/util.go
Original file line number Diff line number Diff line change
Expand Up @@ -124,8 +124,8 @@ func GetNodeIDFromNode(driver string, node *v1.Node) (string, error) {
}

func GetNodeIDFromNodeInfo(driver string, nodeInfo *csiapi.CSINodeInfo) (string, bool) {
for _, d := range nodeInfo.CSIDrivers {
if d.Driver == driver {
for _, d := range nodeInfo.Spec.Drivers {
if d.Name == driver {
return d.NodeID, true
}
}
Expand Down
10 changes: 10 additions & 0 deletions vendor/k8s.io/csi-api/pkg/apis/OWNERS

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

33 changes: 33 additions & 0 deletions vendor/k8s.io/csi-api/pkg/apis/csi/v1alpha1/BUILD

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

52 changes: 52 additions & 0 deletions vendor/k8s.io/csi-api/pkg/apis/csi/v1alpha1/README.md

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

66 changes: 57 additions & 9 deletions vendor/k8s.io/csi-api/pkg/apis/csi/v1alpha1/types.go

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

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

37 changes: 37 additions & 0 deletions vendor/k8s.io/csi-api/pkg/client/clientset/versioned/BUILD

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

42 changes: 42 additions & 0 deletions vendor/k8s.io/csi-api/pkg/client/clientset/versioned/fake/BUILD

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

Loading

0 comments on commit 72143d9

Please sign in to comment.