github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-19 18:02:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #79894 from odinuge/csi-client-dead-code

Browse Source 
Remove dead code from csi_client
This commit is contained in:
Kubernetes Prow Robot 2019-07-10 06:20:25 -07:00 committed by GitHub
commit 021ad88ac4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/volume/csi/csi_client.go
View File

@ -154,19 +154,15 @@ func newCsiDriverClient(driverName csiDriverName) (*csiDriverClient, error) {
return nil, fmt.Errorf("driver name is empty") return nil, fmt.Errorf("driver name is empty")
} }
addr := fmt.Sprintf(csiAddrTemplate, driverName)
requiresV0Client := true
existingDriver, driverExists := csiDrivers.Get(string(driverName)) existingDriver, driverExists := csiDrivers.Get(string(driverName))
if !driverExists { if !driverExists {
return nil, fmt.Errorf("driver name %s not found in the list of registered CSI drivers", driverName) return nil, fmt.Errorf("driver name %s not found in the list of registered CSI drivers", driverName)
} }
addr = existingDriver.endpoint
requiresV0Client = versionRequiresV0Client(existingDriver.highestSupportedVersion)
nodeV1ClientCreator := newV1NodeClient nodeV1ClientCreator := newV1NodeClient
nodeV0ClientCreator := newV0NodeClient nodeV0ClientCreator := newV0NodeClient
if requiresV0Client {
if versionRequiresV0Client(existingDriver.highestSupportedVersion) {
nodeV1ClientCreator = nil nodeV1ClientCreator = nil
} else { } else {
nodeV0ClientCreator = nil nodeV0ClientCreator = nil
@ -174,7 +170,7 @@ func newCsiDriverClient(driverName csiDriverName) (*csiDriverClient, error) {
return &csiDriverClient{ return &csiDriverClient{
driverName: driverName, driverName: driverName,
addr: csiAddr(addr), addr: csiAddr(existingDriver.endpoint),
nodeV1ClientCreator: nodeV1ClientCreator, nodeV1ClientCreator: nodeV1ClientCreator,
nodeV0ClientCreator: nodeV0ClientCreator, nodeV0ClientCreator: nodeV0ClientCreator,
}, nil }, nil