Merge pull request #428 from jsafrane/automated-cherry-pick-of-#426-u…

…pstream-release-2.11 Automated cherry pick of #426: Fix registrar timeout
kubernetes-csi · Jul 12, 2024 · 043c112 · 043c112
2 parents c1cb253 + 85cd07d
commit 043c112
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/cmd/csi-node-driver-registrar/main.go b/cmd/csi-node-driver-registrar/main.go
@@ -178,10 +178,10 @@ func main() {
 	}
 
 	logger.V(1).Info("Calling CSI driver to discover driver name")
-	ctx, cancel := context.WithTimeout(ctx, *operationTimeout)
+	getNameCtx, cancel := context.WithTimeout(ctx, *operationTimeout)
 	defer cancel()
 
-	csiDriverName, err := csirpc.GetDriverName(ctx, csiConn)
+	csiDriverName, err := csirpc.GetDriverName(getNameCtx, csiConn)
 	if err != nil {
 		logger.Error(err, "Error retreiving CSI driver name")
 		klog.FlushAndExit(klog.ExitFlushTimeout, 1)