From d6c642b46a602b12851cb5c54d355e456906c25d Mon Sep 17 00:00:00 2001 From: Fabio Bertinatto Date: Sat, 16 Feb 2019 10:06:33 +0100 Subject: [PATCH] Only return CSI driver registration error --- pkg/volume/csi/csi_plugin.go | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkg/volume/csi/csi_plugin.go b/pkg/volume/csi/csi_plugin.go index e47715a0341..0c51e72c09f 100644 --- a/pkg/volume/csi/csi_plugin.go +++ b/pkg/volume/csi/csi_plugin.go @@ -147,20 +147,16 @@ func (h *RegistrationHandler) RegisterPlugin(pluginName string, endpoint string, driverNodeID, maxVolumePerNode, accessibleTopology, err := csi.NodeGetInfo(ctx) if err != nil { - klog.Error(log("registrationHandler.RegisterPlugin failed at CSI.NodeGetInfo: %v", err)) if unregErr := unregisterDriver(pluginName); unregErr != nil { klog.Error(log("registrationHandler.RegisterPlugin failed to unregister plugin due to previous error: %v", unregErr)) - return unregErr } return err } err = nim.InstallCSIDriver(pluginName, driverNodeID, maxVolumePerNode, accessibleTopology) if err != nil { - klog.Error(log("registrationHandler.RegisterPlugin failed at AddNodeInfo: %v", err)) if unregErr := unregisterDriver(pluginName); unregErr != nil { klog.Error(log("registrationHandler.RegisterPlugin failed to unregister plugin due to previous error: %v", unregErr)) - return unregErr } return err }