Merge pull request #6 from krishchow/podChanges

Pod Info changes

Author: wlan0

cmd/cmd.go

@@ -34,7 +34,6 @@ var (
 	nodeID   = ""
 	protocol = ""
 	listen   = ""
-	basePath = ""
 	//endpoint = "unix://csi/csi.sock"
 )
 
@@ -46,12 +45,11 @@ var driverCmd = &cobra.Command{
 	RunE: func(c *cobra.Command, args []string) error {
 		return driver(args)
 	},
-	Version: Version,
 }
 
 func init() {
-	if driverCmd.Version == "" {
-		driverCmd.Version = "dev"
+	if Version == "" {
+		Version = "dev"
 	}
 
 	viper.AutomaticEnv()
@@ -63,9 +61,8 @@ func init() {
 	driverCmd.PersistentFlags().StringVarP(&identity, "identity", "i", identity, "identity of this COSI CSI driver")
 	//driverCmd.PersistentFlags().StringVarP(&endpoint, "endpoint", "e", endpoint, "endpoint at which COSI CSI driver is listening")
 	driverCmd.PersistentFlags().StringVarP(&nodeID, "node-id", "n", nodeID, "identity of the node in which COSI CSI driver is running")
-	driverCmd.PersistentFlags().StringVarP(&listen, "listen", "l", nodeID, "address of the listening socket for the node server")
-	driverCmd.PersistentFlags().StringVarP(&protocol, "protocol", "p", nodeID, "must be one of tcp, tcp4, tcp6, unix, unixpacket")
-	driverCmd.PersistentFlags().StringVarP(&basePath, "basepath", "p", nodeID, "the base path for the CSI driver")
+	driverCmd.PersistentFlags().StringVarP(&listen, "listen", "l", listen, "address of the listening socket for the node server")
+	driverCmd.PersistentFlags().StringVarP(&protocol, "protocol", "p", protocol, "must be one of tcp, tcp4, tcp6, unix, unixpacket")
 
 	driverCmd.PersistentFlags().MarkHidden("alsologtostderr")
 	driverCmd.PersistentFlags().MarkHidden("log_backtrace_at")

cmd/driver.go

@@ -17,13 +17,13 @@ limitations under the License.
 package cmd
 
 import (
-	"net"
+	"github.com/container-object-storage-interface/ephemeral-csi-driver/pkg/controller"
 	"os"
 
 	cs "github.com/container-object-storage-interface/api/clientset/typed/objectstorage.k8s.io/v1alpha1"
-	"github.com/container-storage-interface/spec/lib/go/csi"
 	"github.com/golang/glog"
-	"google.golang.org/grpc"
+	csicommon "github.com/kubernetes-csi/drivers/pkg/csi-common"
+	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
 	"k8s.io/klog"
 
@@ -48,23 +48,14 @@ func driver(args []string) error {
 	config := &rest.Config{}
 
 	client := cs.NewForConfigOrDie(config)
+	kube := kubernetes.NewForConfigOrDie(config)
 
-	node.Initalize(basePath)
-	node := node.NewNodeServer(identity, nodeID, *client)
-	if err != nil {
-		return err
-	}
+	nodeServer := node.NewNodeServer(identity, nodeID, *client, kube)
+	controllerServer, err := controller.NewControllerServer(identity, nodeID)
 
-	srv := grpc.NewServer()
-	csi.RegisterNodeServer(srv, node)
-	csi.RegisterIdentityServer(srv, idServer)
-	l, err := net.Listen(protocol, listen)
-	if err != nil {
-		klog.Fatalf("could not create listener: %v", err)
-	}
-	if err = srv.Serve(l); err != nil {
-		klog.Fatalf("%v", err)
-	}
+	s := csicommon.NewNonBlockingGRPCServer()
+	s.Start(listen, idServer, controllerServer, nodeServer)
+	s.Wait()
 
 	return nil
 }

go.mod

@@ -10,8 +10,9 @@ require (
 	github.com/go-openapi/spec v0.19.9 // indirect
 	github.com/go-openapi/swag v0.19.9 // indirect
 	github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
-	github.com/golang/protobuf v1.4.2 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
+	github.com/kubernetes-csi/csi-lib-utils v0.8.1 // indirect
+	github.com/kubernetes-csi/drivers v1.0.2
 	github.com/magiconair/properties v1.8.4 // indirect
 	github.com/mailru/easyjson v0.7.6 // indirect
 	github.com/mitchellh/mapstructure v1.3.3 // indirect
@@ -29,7 +30,7 @@ require (
 	google.golang.org/genproto v0.0.0-20201002142447-3860012362da // indirect
 	google.golang.org/grpc v1.32.0
 	gopkg.in/ini.v1 v1.61.0 // indirect
-    k8s.io/api v0.19.2
+	k8s.io/api v0.19.2
 	k8s.io/apimachinery v0.19.2
 	k8s.io/client-go v0.19.2
 	k8s.io/klog v1.0.0