Fix loglevel flag

Author: Praveenrajmani

cmd/direct-csi/cmd.go

@@ -45,6 +45,7 @@ var (
 	conversionWebhook    = false
 	conversionWebhookURL = ""
 	loopBackOnly         = false
+	showVersion          = false
 )
 
 var driverCmd = &cobra.Command{
@@ -59,18 +60,20 @@ For more information, use '%s man [sched | examples | ...]'
 `, os.Args[0]),
 	SilenceUsage: true,
 	RunE: func(c *cobra.Command, args []string) error {
+		if showVersion {
+			fmt.Println(Version)
+			return nil
+		}
 		if !controller && !driver && !conversionWebhook {
 			return fmt.Errorf("one among [--controller, --driver, --conversion-webhook] should be set")
 		}
-
 		return run(c.Context(), args)
 	},
-	Version: Version,
 }
 
 func init() {
-	if driverCmd.Version == "" {
-		driverCmd.Version = "dev"
+	if Version == "" {
+		Version = "dev"
 	}
 
 	viper.AutomaticEnv()
@@ -81,11 +84,13 @@ func init() {
 
 	// parse the go default flagset to get flags for glog and other packages in future
 	driverCmd.PersistentFlags().AddGoFlagSet(flag.CommandLine)
+	driverCmd.PersistentFlags().AddGoFlagSet(kflags)
 	// defaulting this to true so that logs are printed to console
 	flag.Set("logtostderr", "true")
 
 	driverCmd.PersistentFlags().StringVarP(&kubeconfig, "kubeconfig", "k", kubeconfig, "path to kubeconfig")
 	driverCmd.Flags().StringVarP(&identity, "identity", "i", identity, "identity of this direct-csi")
+	driverCmd.Flags().BoolVarP(&showVersion, "version", "", showVersion, "version of direct-csi")
 	driverCmd.Flags().StringVarP(&endpoint, "endpoint", "e", endpoint, "endpoint at which direct-csi is listening")
 	driverCmd.Flags().StringVarP(&nodeID, "node-id", "n", nodeID, "identity of the node in which direct-csi is running")
 	driverCmd.Flags().StringVarP(&rack, "rack", "", rack, "identity of the rack in which this direct-csi is running")

cmd/kubectl-direct_csi/cmd.go

@@ -34,19 +34,19 @@ var (
 	identity       = "direct.csi.min.io"
 	dryRun         = false
 	dryRunFlagName = "dry-run"
+	showVersion    = false
 )
 
 var pluginCmd = &cobra.Command{
 	Use:           "direct-csi",
 	Short:         "Plugin for managing Direct CSI drives and volumes",
 	SilenceUsage:  true,
 	SilenceErrors: false,
-	Version:       Version,
 }
 
 func init() {
-	if pluginCmd.Version == "" {
-		pluginCmd.Version = "dev"
+	if Version == "" {
+		Version = "dev"
 	}
 
 	viper.AutomaticEnv()
@@ -57,6 +57,7 @@ func init() {
 
 	// parse the go default flagset to get flags for glog and other packages in future
 	pluginCmd.PersistentFlags().AddGoFlagSet(flag.CommandLine)
+	pluginCmd.PersistentFlags().AddGoFlagSet(kflags)
 	// defaulting this to true so that logs are printed to console
 	flag.Set("logtostderr", "true")
 
@@ -84,5 +85,6 @@ func init() {
 }
 
 func Execute(ctx context.Context) error {
+
 	return pluginCmd.ExecuteContext(ctx)
 }

minio.yaml

@@ -65,29 +65,29 @@ spec:
       #     - {key: direct.csi.min.io/access-tier, operator: In, values: [Hot]}
       resources:
         requests:
-          storage: 2Gi    
+          storage: 512Mi    
       storageClassName: direct-csi-min-io # This field references the existing StorageClass
   - metadata:
       name: minio-data-2
     spec:
       accessModes: [ "ReadWriteOnce" ]
       resources:
         requests:
-          storage: 2Gi  
+          storage: 512Mi  
       storageClassName: direct-csi-min-io # This field references the existing StorageClass
   - metadata:
       name: minio-data-3
     spec:
       accessModes: [ "ReadWriteOnce" ]
       resources:
         requests:
-          storage: 2Gi
+          storage: 512Mi
       storageClassName: direct-csi-min-io # This field references the existing StorageClass
   - metadata:
       name: minio-data-4
     spec:
       accessModes: [ "ReadWriteOnce" ]
       resources:
         requests:
-          storage: 2Gi 
+          storage: 512Mi 
       storageClassName: direct-csi-min-io # This field references the existing StorageClass

pkg/controller/controller.go

@@ -164,6 +164,7 @@ func (c *ControllerServer) ValidateVolumeCapabilities(ctx context.Context, req *
 
 // CreateVolume - Creates a DirectCSI Volume
 func (c *ControllerServer) CreateVolume(ctx context.Context, req *csi.CreateVolumeRequest) (*csi.CreateVolumeResponse, error) {
+	klog.V(4).Infof("CreateVolumeRequest: %v", req)
 	name := req.GetName()
 	if name == "" {
 		return nil, status.Error(codes.InvalidArgument, "volume name cannot be empty")

pkg/node/publish_unpublish.go

@@ -63,6 +63,7 @@ func parseVolumeContext(volumeContext map[string]string) (name, ns string, err e
 }
 
 func (n *NodeServer) NodePublishVolume(ctx context.Context, req *csi.NodePublishVolumeRequest) (*csi.NodePublishVolumeResponse, error) {
+	klog.V(3).Infof("NodePublishVolumeRequest: %v", req)
 	vID := req.GetVolumeId()
 	if vID == "" {
 		return nil, status.Error(codes.InvalidArgument, "volume ID missing in request")
@@ -158,6 +159,7 @@ func (n *NodeServer) NodePublishVolume(ctx context.Context, req *csi.NodePublish
 }
 
 func (n *NodeServer) NodeUnpublishVolume(ctx context.Context, req *csi.NodeUnpublishVolumeRequest) (*csi.NodeUnpublishVolumeResponse, error) {
+	klog.V(3).Infof("NodeUnPublishVolumeRequest: %v", req)
 	vID := req.GetVolumeId()
 	if vID == "" {
 		return nil, status.Error(codes.InvalidArgument, "volume ID missing in request")

pkg/node/stage_unstage.go

@@ -31,9 +31,11 @@ import (
 	"github.com/container-storage-interface/spec/lib/go/csi"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
+	"k8s.io/klog"
 )
 
 func (n *NodeServer) NodeStageVolume(ctx context.Context, req *csi.NodeStageVolumeRequest) (*csi.NodeStageVolumeResponse, error) {
+	klog.V(3).Infof("NodeStageVolumeRequest: %v", req)
 	vID := req.GetVolumeId()
 	if vID == "" {
 		return nil, status.Error(codes.InvalidArgument, "volume ID missing in request")
@@ -97,6 +99,7 @@ func (n *NodeServer) NodeStageVolume(ctx context.Context, req *csi.NodeStageVolu
 }
 
 func (n *NodeServer) NodeUnstageVolume(ctx context.Context, req *csi.NodeUnstageVolumeRequest) (*csi.NodeUnstageVolumeResponse, error) {
+	klog.V(3).Infof("NodeUnStageVolumeRequest: %v", req)
 	vID := req.GetVolumeId()
 	if vID == "" {
 		return nil, status.Error(codes.InvalidArgument, "volume ID missing in request")

pkg/utils/installer/install.go

@@ -366,6 +366,7 @@ func CreateDaemonSet(ctx context.Context, identity string, directCSIContainerIma
 				Name:  nodeDriverRegistrarContainerName,
 				Image: filepath.Join(registry, org, nodeDriverRegistrarContainerImage),
 				Args: []string{
+					fmt.Sprintf("--v=%d", logLevel),
 					"--csi-address=unix:///csi/csi.sock",
 					fmt.Sprintf("--kubelet-registration-path=%s",
 						newDirectCSIPluginsSocketDir(kubeletDirPath, name)+"/csi.sock"),
@@ -394,6 +395,7 @@ func CreateDaemonSet(ctx context.Context, identity string, directCSIContainerIma
 				Args: func() []string {
 					args := []string{
 						fmt.Sprintf("--identity=%s", name),
+						fmt.Sprintf("-v=%d", logLevel),
 						fmt.Sprintf("--endpoint=$(%s)", endpointEnvVarCSI),
 						fmt.Sprintf("--node-id=$(%s)", kubeNodeNameEnvVar),
 						fmt.Sprintf("--conversion-webhook-url=%s", conversionWebhookURL),
@@ -635,6 +637,7 @@ func CreateDeployment(ctx context.Context, identity string, directCSIContainerIm
 				Name:  csiProvisionerContainerName,
 				Image: filepath.Join(registry, org, csiProvisionerContainerImage),
 				Args: []string{
+					fmt.Sprintf("--v=%d", logLevel),
 					"--timeout=300s",
 					fmt.Sprintf("--csi-address=$(%s)", endpointEnvVarCSI),
 					"--leader-election",
@@ -673,6 +676,7 @@ func CreateDeployment(ctx context.Context, identity string, directCSIContainerIm
 				Name:  directCSIContainerName,
 				Image: filepath.Join(registry, org, directCSIContainerImage),
 				Args: []string{
+					fmt.Sprintf("-v=%d", logLevel),
 					fmt.Sprintf("--identity=%s", name),
 					fmt.Sprintf("--endpoint=$(%s)", endpointEnvVarCSI),
 					fmt.Sprintf("--conversion-webhook-url=%s", conversionWebhookURL),