switch from glog to klog

Replace glog with klog in all go source files.
Fix several compile errors.
Add "klog.InitFlags(nil)" and remove flag.Set("logtostderr", "true"), which is now the default.
Run go mod tidy + go mod vendor.

Author: huww98

cmd/hostpathplugin/main.go

@@ -25,15 +25,11 @@ import (
 	"path"
 	"syscall"
 
-	"github.com/golang/glog"
 	"github.com/kubernetes-csi/csi-driver-host-path/internal/proxy"
 	"github.com/kubernetes-csi/csi-driver-host-path/pkg/hostpath"
+	"k8s.io/klog/v2"
 )
 
-func init() {
-	flag.Set("logtostderr", "true")
-}
-
 var (
 	// Set by the build process
 	version = ""
@@ -70,6 +66,7 @@ func main() {
 	// for proxying incoming calls to the embedded mock CSI driver.
 	proxyEndpoint := flag.String("proxy-endpoint", "", "Instead of running the CSI driver code, just proxy connections from csiEndpoint to the given listening socket.")
 
+	klog.InitFlags(nil)
 	flag.Parse()
 
 	if *showVersion {
@@ -87,7 +84,7 @@ func main() {
 		defer cancel()
 		closer, err := proxy.Run(ctx, cfg.Endpoint, *proxyEndpoint)
 		if err != nil {
-			glog.Fatalf("failed to run proxy: %v", err)
+			klog.Fatalf("failed to run proxy: %v", err)
 		}
 		defer closer.Close()
 

go.mod

@@ -4,7 +4,6 @@ go 1.21
 
 require (
 	github.com/container-storage-interface/spec v1.9.0
-	github.com/golang/glog v1.2.1
 	github.com/golang/protobuf v1.5.4
 	github.com/kubernetes-csi/csi-lib-utils v0.17.0
 	github.com/pborman/uuid v1.2.1

go.sum

@@ -13,8 +13,6 @@ github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ=
 github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
 github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
-github.com/golang/glog v1.2.1 h1:OptwRhECazUx5ix5TTWC3EZhsZEHWcYWY4FQHTIubm4=
-github.com/golang/glog v1.2.1/go.mod h1:6AhwSGph0fcJtXVM/PEHPqZlFeoLxhs7/t5UDAwmO+w=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
 github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=

internal/proxy/proxy.go

@@ -35,9 +35,8 @@ import (
 	"io"
 	"net"
 
-	"github.com/golang/glog"
-
 	"github.com/kubernetes-csi/csi-driver-host-path/internal/endpoint"
+	"k8s.io/klog/v2"
 )
 
 // New listens on both endpoints and starts accepting connections
@@ -63,7 +62,7 @@ func Run(ctx context.Context, endpoint1, endpoint2 string) (io.Closer, error) {
 		return nil, fmt.Errorf("listen %s: %v", endpoint2, err)
 	}
 
-	glog.V(3).Infof("proxy listening on %s and %s", endpoint1, endpoint2)
+	klog.V(3).Infof("proxy listening on %s and %s", endpoint1, endpoint2)
 
 	go func() {
 		for {
@@ -73,19 +72,19 @@ func Run(ctx context.Context, endpoint1, endpoint2 string) (io.Closer, error) {
 			conn1 := accept(proxy.ctx, proxy.s1, endpoint1)
 			if conn1 == nil {
 				// Done, shut down.
-				glog.V(5).Infof("proxy endpoint %s closed, shutting down", endpoint1)
+				klog.V(5).Infof("proxy endpoint %s closed, shutting down", endpoint1)
 				return
 			}
 			conn2 := accept(proxy.ctx, proxy.s2, endpoint2)
 			if conn2 == nil {
 				// Done, shut down. The already accepted
 				// connection gets closed.
-				glog.V(5).Infof("proxy endpoint %s closed, shutting down and close established connection", endpoint2)
+				klog.V(5).Infof("proxy endpoint %s closed, shutting down and close established connection", endpoint2)
 				conn1.Close()
 				return
 			}
 
-			glog.V(3).Infof("proxy established a new connection between %s and %s", endpoint1, endpoint2)
+			klog.V(3).Infof("proxy established a new connection between %s and %s", endpoint1, endpoint2)
 			go copy(conn1, conn2, endpoint1, endpoint2)
 			go copy(conn2, conn1, endpoint2, endpoint1)
 		}
@@ -122,13 +121,13 @@ func (p *proxy) Close() error {
 }
 
 func copy(from, to net.Conn, fromEndpoint, toEndpoint string) {
-	glog.V(5).Infof("starting to copy %s -> %s", fromEndpoint, toEndpoint)
+	klog.V(5).Infof("starting to copy %s -> %s", fromEndpoint, toEndpoint)
 	// Signal recipient that no more data is going to come.
 	// This also stops reading from it.
 	defer to.Close()
 	// Copy data until EOF.
 	cnt, err := io.Copy(to, from)
-	glog.V(5).Infof("done copying %s -> %s: %d bytes, %v", fromEndpoint, toEndpoint, cnt, err)
+	klog.V(5).Infof("done copying %s -> %s: %d bytes, %v", fromEndpoint, toEndpoint, cnt, err)
 }
 
 func accept(ctx context.Context, s net.Listener, endpoint string) net.Conn {
@@ -141,6 +140,6 @@ func accept(ctx context.Context, s net.Listener, endpoint string) net.Conn {
 		if ctx.Err() != nil {
 			return nil
 		}
-		glog.V(3).Infof("accept on %s failed: %v", endpoint, err)
+		klog.V(3).Infof("accept on %s failed: %v", endpoint, err)
 	}
 }

pkg/hostpath/controllerserver.go

@@ -25,7 +25,6 @@ import (
 
 	"github.com/golang/protobuf/ptypes"
 
-	"github.com/golang/glog"
 	"github.com/golang/protobuf/ptypes/wrappers"
 	"github.com/pborman/uuid"
 	"golang.org/x/net/context"
@@ -45,13 +44,13 @@ const (
 
 func (hp *hostPath) CreateVolume(ctx context.Context, req *csi.CreateVolumeRequest) (resp *csi.CreateVolumeResponse, finalErr error) {
 	if err := hp.validateControllerServiceRequest(csi.ControllerServiceCapability_RPC_CREATE_DELETE_VOLUME); err != nil {
-		glog.V(3).Infof("invalid create volume req: %v", req)
+		klog.V(3).Infof("invalid create volume req: %v", req)
 		return nil, err
 	}
 
 	if len(req.GetMutableParameters()) > 0 {
 		if err := hp.validateControllerServiceRequest(csi.ControllerServiceCapability_RPC_MODIFY_VOLUME); err != nil {
-			glog.V(3).Infof("invalid create volume req: %v", req)
+			klog.V(3).Infof("invalid create volume req: %v", req)
 			return nil, err
 		}
 		// Check if the mutable parameters are in the accepted list
@@ -152,7 +151,7 @@ func (hp *hostPath) CreateVolume(ctx context.Context, req *csi.CreateVolumeReque
 	if err != nil {
 		return nil, err
 	}
-	glog.V(4).Infof("created volume %s at path %s", vol.VolID, vol.VolPath)
+	klog.V(4).Infof("created volume %s at path %s", vol.VolID, vol.VolPath)
 
 	if req.GetVolumeContentSource() != nil {
 		path := hp.getVolumePath(volumeID)
@@ -172,13 +171,13 @@ func (hp *hostPath) CreateVolume(ctx context.Context, req *csi.CreateVolumeReque
 			err = status.Errorf(codes.InvalidArgument, "%v not a proper volume source", volumeSource)
 		}
 		if err != nil {
-			glog.V(4).Infof("VolumeSource error: %v", err)
+			klog.V(4).Infof("VolumeSource error: %v", err)
 			if delErr := hp.deleteVolume(volumeID); delErr != nil {
-				glog.V(2).Infof("deleting hostpath volume %v failed: %v", volumeID, delErr)
+				klog.V(2).Infof("deleting hostpath volume %v failed: %v", volumeID, delErr)
 			}
 			return nil, err
 		}
-		glog.V(4).Infof("successfully populated volume %s", vol.VolID)
+		klog.V(4).Infof("successfully populated volume %s", vol.VolID)
 	}
 
 	return &csi.CreateVolumeResponse{
@@ -199,7 +198,7 @@ func (hp *hostPath) DeleteVolume(ctx context.Context, req *csi.DeleteVolumeReque
 	}
 
 	if err := hp.validateControllerServiceRequest(csi.ControllerServiceCapability_RPC_CREATE_DELETE_VOLUME); err != nil {
-		glog.V(3).Infof("invalid delete volume req: %v", req)
+		klog.V(3).Infof("invalid delete volume req: %v", req)
 		return nil, err
 	}
 
@@ -227,7 +226,7 @@ func (hp *hostPath) DeleteVolume(ctx context.Context, req *csi.DeleteVolumeReque
 	if err := hp.deleteVolume(volId); err != nil {
 		return nil, fmt.Errorf("failed to delete volume %v: %w", volId, err)
 	}
-	glog.V(4).Infof("volume %v successfully deleted", volId)
+	klog.V(4).Infof("volume %v successfully deleted", volId)
 
 	return &csi.DeleteVolumeResponse{}, nil
 }
@@ -446,7 +445,7 @@ func (hp *hostPath) ListVolumes(ctx context.Context, req *csi.ListVolumesRequest
 	for index := startIdx - 1; index < volumesLength && index < maxLength; index++ {
 		hpVolume = volumes[index]
 		healthy, msg := hp.doHealthCheckInControllerSide(hpVolume.VolID)
-		glog.V(3).Infof("Healthy state: %s Volume: %t", hpVolume.VolName, healthy)
+		klog.V(3).Infof("Healthy state: %s Volume: %t", hpVolume.VolName, healthy)
 		volumeRes.Entries = append(volumeRes.Entries, &csi.ListVolumesResponse_Entry{
 			Volume: &csi.Volume{
 				VolumeId:      hpVolume.VolID,
@@ -462,7 +461,7 @@ func (hp *hostPath) ListVolumes(ctx context.Context, req *csi.ListVolumesRequest
 		})
 	}
 
-	glog.V(5).Infof("Volumes are: %+v", *volumeRes)
+	klog.V(5).Infof("Volumes are: %+v", *volumeRes)
 	return volumeRes, nil
 }
 
@@ -489,7 +488,7 @@ func (hp *hostPath) ControllerGetVolume(ctx context.Context, req *csi.Controller
 	}
 
 	healthy, msg := hp.doHealthCheckInControllerSide(req.GetVolumeId())
-	glog.V(3).Infof("Healthy state: %s Volume: %t", volume.VolName, healthy)
+	klog.V(3).Infof("Healthy state: %s Volume: %t", volume.VolName, healthy)
 	return &csi.ControllerGetVolumeResponse{
 		Volume: &csi.Volume{
 			VolumeId:      volume.VolID,
@@ -541,7 +540,7 @@ func (hp *hostPath) ControllerModifyVolume(ctx context.Context, req *csi.Control
 // archives of entire directories. The host image must have "tar" binaries in /bin, /usr/sbin, or /usr/bin.
 func (hp *hostPath) CreateSnapshot(ctx context.Context, req *csi.CreateSnapshotRequest) (*csi.CreateSnapshotResponse, error) {
 	if err := hp.validateControllerServiceRequest(csi.ControllerServiceCapability_RPC_CREATE_DELETE_SNAPSHOT); err != nil {
-		glog.V(3).Infof("invalid create snapshot req: %v", req)
+		klog.V(3).Infof("invalid create snapshot req: %v", req)
 		return nil, err
 	}
 
@@ -592,7 +591,7 @@ func (hp *hostPath) CreateSnapshot(ctx context.Context, req *csi.CreateSnapshotR
 		return nil, err
 	}
 
-	glog.V(4).Infof("create volume snapshot %s", file)
+	klog.V(4).Infof("create volume snapshot %s", file)
 	snapshot := state.Snapshot{}
 	snapshot.Name = req.GetName()
 	snapshot.Id = snapshotID
@@ -623,7 +622,7 @@ func (hp *hostPath) DeleteSnapshot(ctx context.Context, req *csi.DeleteSnapshotR
 	}
 
 	if err := hp.validateControllerServiceRequest(csi.ControllerServiceCapability_RPC_CREATE_DELETE_SNAPSHOT); err != nil {
-		glog.V(3).Infof("invalid delete snapshot req: %v", req)
+		klog.V(3).Infof("invalid delete snapshot req: %v", req)
 		return nil, err
 	}
 	snapshotID := req.GetSnapshotId()
@@ -638,7 +637,7 @@ func (hp *hostPath) DeleteSnapshot(ctx context.Context, req *csi.DeleteSnapshotR
 		return nil, status.Errorf(codes.InvalidArgument, "Snapshot with ID %s is part of groupsnapshot %s", snapshotID, snapshot.GroupSnapshotID)
 	}
 
-	glog.V(4).Infof("deleting snapshot %s", snapshotID)
+	klog.V(4).Infof("deleting snapshot %s", snapshotID)
 	path := hp.getSnapshotPath(snapshotID)
 	os.RemoveAll(path)
 	if err := hp.state.DeleteSnapshot(snapshotID); err != nil {
@@ -649,7 +648,7 @@ func (hp *hostPath) DeleteSnapshot(ctx context.Context, req *csi.DeleteSnapshotR
 
 func (hp *hostPath) ListSnapshots(ctx context.Context, req *csi.ListSnapshotsRequest) (*csi.ListSnapshotsResponse, error) {
 	if err := hp.validateControllerServiceRequest(csi.ControllerServiceCapability_RPC_LIST_SNAPSHOTS); err != nil {
-		glog.V(3).Infof("invalid list snapshot req: %v", req)
+		klog.V(3).Infof("invalid list snapshot req: %v", req)
 		return nil, err
 	}
 

pkg/hostpath/groupcontrollerserver.go

@@ -20,12 +20,12 @@ import (
 	"os"
 
 	"github.com/container-storage-interface/spec/lib/go/csi"
-	"github.com/golang/glog"
 	"github.com/golang/protobuf/ptypes"
 	"github.com/pborman/uuid"
 	"golang.org/x/net/context"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
+	"k8s.io/klog/v2"
 
 	"github.com/kubernetes-csi/csi-driver-host-path/pkg/state"
 )
@@ -44,7 +44,7 @@ func (hp *hostPath) GroupControllerGetCapabilities(context.Context, *csi.GroupCo
 
 func (hp *hostPath) CreateVolumeGroupSnapshot(ctx context.Context, req *csi.CreateVolumeGroupSnapshotRequest) (*csi.CreateVolumeGroupSnapshotResponse, error) {
 	if err := hp.validateGroupControllerServiceRequest(csi.GroupControllerServiceCapability_RPC_CREATE_DELETE_GET_VOLUME_GROUP_SNAPSHOT); err != nil {
-		glog.V(3).Infof("invalid create volume group snapshot req: %v", req)
+		klog.V(3).Infof("invalid create volume group snapshot req: %v", req)
 		return nil, err
 	}
 
@@ -129,7 +129,7 @@ func (hp *hostPath) CreateVolumeGroupSnapshot(ctx context.Context, req *csi.Crea
 			return nil, err
 		}
 
-		glog.V(4).Infof("create volume snapshot %s", file)
+		klog.V(4).Infof("create volume snapshot %s", file)
 		snapshot := state.Snapshot{}
 		snapshot.Name = req.GetName() + "-" + volumeID
 		snapshot.Id = snapshotID
@@ -170,7 +170,7 @@ func (hp *hostPath) CreateVolumeGroupSnapshot(ctx context.Context, req *csi.Crea
 
 func (hp *hostPath) DeleteVolumeGroupSnapshot(ctx context.Context, req *csi.DeleteVolumeGroupSnapshotRequest) (*csi.DeleteVolumeGroupSnapshotResponse, error) {
 	if err := hp.validateGroupControllerServiceRequest(csi.GroupControllerServiceCapability_RPC_CREATE_DELETE_GET_VOLUME_GROUP_SNAPSHOT); err != nil {
-		glog.V(3).Infof("invalid delete volume group snapshot req: %v", req)
+		klog.V(3).Infof("invalid delete volume group snapshot req: %v", req)
 		return nil, err
 	}
 
@@ -197,7 +197,7 @@ func (hp *hostPath) DeleteVolumeGroupSnapshot(ctx context.Context, req *csi.Dele
 	}
 
 	for _, snapshotID := range groupSnapshot.SnapshotIDs {
-		glog.V(4).Infof("deleting snapshot %s", snapshotID)
+		klog.V(4).Infof("deleting snapshot %s", snapshotID)
 		path := hp.getSnapshotPath(snapshotID)
 		os.RemoveAll(path)
 
@@ -206,7 +206,7 @@ func (hp *hostPath) DeleteVolumeGroupSnapshot(ctx context.Context, req *csi.Dele
 		}
 	}
 
-	glog.V(4).Infof("deleting groupsnapshot %s", groupSnapshotID)
+	klog.V(4).Infof("deleting groupsnapshot %s", groupSnapshotID)
 	if err := hp.state.DeleteGroupSnapshot(groupSnapshotID); err != nil {
 		return nil, err
 	}
@@ -216,7 +216,7 @@ func (hp *hostPath) DeleteVolumeGroupSnapshot(ctx context.Context, req *csi.Dele
 
 func (hp *hostPath) GetVolumeGroupSnapshot(ctx context.Context, req *csi.GetVolumeGroupSnapshotRequest) (*csi.GetVolumeGroupSnapshotResponse, error) {
 	if err := hp.validateGroupControllerServiceRequest(csi.GroupControllerServiceCapability_RPC_CREATE_DELETE_GET_VOLUME_GROUP_SNAPSHOT); err != nil {
-		glog.V(3).Infof("invalid get volume group snapshot req: %v", req)
+		klog.V(3).Infof("invalid get volume group snapshot req: %v", req)
 		return nil, err
 	}
 

pkg/hostpath/healthcheck.go

@@ -23,7 +23,7 @@ import (
 	"os/exec"
 	"strings"
 
-	"github.com/golang/glog"
+	"k8s.io/klog/v2"
 	fs "k8s.io/kubernetes/pkg/volume/util/fs"
 )
 
@@ -85,7 +85,7 @@ func checkMountPointExist(volumePath string) (bool, error) {
 
 	out, err := exec.Command(cmdPath, "--json").CombinedOutput()
 	if err != nil {
-		glog.V(3).Infof("failed to execute command: %+v", cmdPath)
+		klog.V(3).Infof("failed to execute command: %+v", cmdPath)
 		return false, err
 	}
 
@@ -138,7 +138,7 @@ func (hp *hostPath) checkPVCapacityValid(volID string) (bool, error) {
 		return false, err
 	}
 	volumeCapacity := volume.VolSize
-	glog.V(3).Infof("volume capacity: %+v fs capacity:%+v", volumeCapacity, fscapacity)
+	klog.V(3).Infof("volume capacity: %+v fs capacity:%+v", volumeCapacity, fscapacity)
 	return fscapacity >= volumeCapacity, nil
 }
 
@@ -153,13 +153,13 @@ func (hp *hostPath) checkPVUsage(volID string) (bool, error) {
 		return false, err
 	}
 
-	glog.V(3).Infof("fs available: %+v", fsavailable)
+	klog.V(3).Infof("fs available: %+v", fsavailable)
 	return fsavailable > 0, nil
 }
 
 func (hp *hostPath) doHealthCheckInControllerSide(volID string) (bool, string) {
 	volumePath := hp.getVolumePath(volID)
-	glog.V(3).Infof("Volume with ID %s has path %s.", volID, volumePath)
+	klog.V(3).Infof("Volume with ID %s has path %s.", volID, volumePath)
 	spExist, err := checkPathExist(volumePath)
 	if err != nil {
 		return false, err.Error()