Update to new csi-lib-utils

Add context where necessary.

cmd/csi-node-driver-registrar/main.go

@@ -155,14 +155,15 @@ func main() {
 	// can skip adding mapping to "csi.volume.kubernetes.io/nodeid" annotation.
 
 	klog.V(1).Infof("Attempting to open a gRPC connection with: %q", *csiAddress)
-	csiConn, err := connection.ConnectWithoutMetrics(*csiAddress)
+	ctx := context.Background()
+	csiConn, err := connection.ConnectWithoutMetrics(ctx, *csiAddress)
 	if err != nil {
 		klog.Errorf("error connecting to CSI driver: %v", err)
 		os.Exit(1)
 	}
 
 	klog.V(1).Infof("Calling CSI driver to discover driver name")
-	ctx, cancel := context.WithTimeout(context.Background(), *operationTimeout)
+	ctx, cancel := context.WithTimeout(ctx, *operationTimeout)
 	defer cancel()
 
 	csiDriverName, err := csirpc.GetDriverName(ctx, csiConn)
@@ -174,5 +175,5 @@ func main() {
 	defer closeGrpcConnection(*csiAddress, csiConn)
 
 	// Run forever
-	nodeRegister(csiDriverName, addr)
+	nodeRegister(ctx, csiDriverName, addr)
 }

cmd/csi-node-driver-registrar/node_register.go

@@ -35,7 +35,7 @@ import (
 	registerapi "k8s.io/kubelet/pkg/apis/pluginregistration/v1"
 )
 
-func nodeRegister(csiDriverName, httpEndpoint string) {
+func nodeRegister(ctx context.Context, csiDriverName, httpEndpoint string) {
 	// When kubeletRegistrationPath is specified then driver-registrar ONLY acts
 	// as gRPC server which replies to registration requests initiated by kubelet's
 	// plugins watcher infrastructure. Node labeling is done by kubelet's csi code.
@@ -67,7 +67,7 @@ func nodeRegister(csiDriverName, httpEndpoint string) {
 	// Registers kubelet plugin watcher api.
 	registerapi.RegisterRegistrationServer(grpcServer, registrar)
 
-	go httpServer(socketPath, httpEndpoint, csiDriverName)
+	go httpServer(ctx, socketPath, httpEndpoint, csiDriverName)
 	go removeRegSocket(csiDriverName)
 	// Starts service
 	if err := grpcServer.Serve(lis); err != nil {
@@ -83,7 +83,7 @@ func buildSocketPath(csiDriverName string) string {
 	return fmt.Sprintf("%s/%s-reg.sock", *pluginRegistrationPath, csiDriverName)
 }
 
-func httpServer(socketPath string, httpEndpoint string, csiDriverName string) {
+func httpServer(ctx context.Context, socketPath string, httpEndpoint string, csiDriverName string) {
 	if httpEndpoint == "" {
 		klog.Infof("Skipping HTTP server because endpoint is set to: %q", httpEndpoint)
 		return
@@ -95,7 +95,7 @@ func httpServer(socketPath string, httpEndpoint string, csiDriverName string) {
 	mux.HandleFunc("/healthz", func(w http.ResponseWriter, req *http.Request) {
 		socketExists, err := util.DoesSocketExist(socketPath)
 		if err == nil && socketExists {
-			grpcSocketCheckError := checkLiveRegistrationSocket(socketPath, csiDriverName)
+			grpcSocketCheckError := checkLiveRegistrationSocket(ctx, socketPath, csiDriverName)
 			if grpcSocketCheckError != nil {
 				w.WriteHeader(http.StatusInternalServerError)
 				w.Write([]byte(grpcSocketCheckError.Error()))
@@ -129,9 +129,9 @@ func httpServer(socketPath string, httpEndpoint string, csiDriverName string) {
 	klog.Fatal(http.ListenAndServe(httpEndpoint, mux))
 }
 
-func checkLiveRegistrationSocket(socketFile, csiDriverName string) error {
+func checkLiveRegistrationSocket(ctx context.Context, socketFile, csiDriverName string) error {
 	klog.V(2).Infof("Attempting to open a gRPC connection with: %q", socketFile)
-	grpcConn, err := connection.ConnectWithoutMetrics(socketFile)
+	grpcConn, err := connection.ConnectWithoutMetrics(ctx, socketFile)
 	if err != nil {
 		return fmt.Errorf("error connecting to node-registrar socket %s: %v", socketFile, err)
 	}