From 542c335fcadd12a86d7382a4a7b65b2f7580f32f Mon Sep 17 00:00:00 2001 From: Odin Ugedal Date: Mon, 8 Jul 2019 17:53:52 +0200 Subject: [PATCH] Remove dead code from csi_client When removing a feature flag in 35bc5dc6b661a36d4259188d2c7f2f4e4b91a0ac, a few of the lines were removed, resulting in some dead code. --- pkg/volume/csi/csi_client.go | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/pkg/volume/csi/csi_client.go b/pkg/volume/csi/csi_client.go index e34be691db8..93faf0f7fd1 100644 --- a/pkg/volume/csi/csi_client.go +++ b/pkg/volume/csi/csi_client.go @@ -154,19 +154,15 @@ func newCsiDriverClient(driverName csiDriverName) (*csiDriverClient, error) { return nil, fmt.Errorf("driver name is empty") } - addr := fmt.Sprintf(csiAddrTemplate, driverName) - requiresV0Client := true existingDriver, driverExists := csiDrivers.Get(string(driverName)) if !driverExists { 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 nodeV0ClientCreator := newV0NodeClient - if requiresV0Client { + + if versionRequiresV0Client(existingDriver.highestSupportedVersion) { nodeV1ClientCreator = nil } else { nodeV0ClientCreator = nil @@ -174,7 +170,7 @@ func newCsiDriverClient(driverName csiDriverName) (*csiDriverClient, error) { return &csiDriverClient{ driverName: driverName, - addr: csiAddr(addr), + addr: csiAddr(existingDriver.endpoint), nodeV1ClientCreator: nodeV1ClientCreator, nodeV0ClientCreator: nodeV0ClientCreator, }, nil