removed controller from deployment

Author: Krish Chowdhary

Makefile

@@ -1,9 +1,11 @@
+repository = krishchow
+version = v0.1
 
 build:
 	go build -o bin/main main.go
 
 docker: build
-	docker build --tag quay.io/krishchow/ephemeral-csi-driver:v0.06 .
+	docker build --tag quay.io/$(repository)/ephemeral-csi-driver:$(version) .
 
 push: docker
-	docker push quay.io/krishchow/ephemeral-csi-driver:v0.06
+	docker push quay.io/$(repository)/ephemeral-csi-driver:$(version)

cmd/cmd.go

@@ -34,6 +34,7 @@ var (
 	nodeID   = ""
 	protocol = ""
 	listen   = ""
+	basePath = ""
 	//endpoint = "unix://csi/csi.sock"
 )
 
@@ -45,11 +46,12 @@ var driverCmd = &cobra.Command{
 	RunE: func(c *cobra.Command, args []string) error {
 		return driver(args)
 	},
+	Version: Version,
 }
 
 func init() {
-	if Version == "" {
-		Version = "dev"
+	if driverCmd.Version == "" {
+		driverCmd.Version = "dev"
 	}
 
 	viper.AutomaticEnv()
@@ -61,8 +63,9 @@ 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", 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().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().MarkHidden("alsologtostderr")
 	driverCmd.PersistentFlags().MarkHidden("log_backtrace_at")

cmd/driver.go

@@ -17,13 +17,13 @@ limitations under the License.
 package cmd
 
 import (
-	"github.com/container-object-storage-interface/ephemeral-csi-driver/pkg/controller"
+	"net"
 	"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"
-	csicommon "github.com/kubernetes-csi/drivers/pkg/csi-common"
-	"k8s.io/client-go/kubernetes"
+	"google.golang.org/grpc"
 	"k8s.io/client-go/rest"
 	"k8s.io/klog"
 
@@ -48,14 +48,23 @@ func driver(args []string) error {
 	config := &rest.Config{}
 
 	client := cs.NewForConfigOrDie(config)
-	kube := kubernetes.NewForConfigOrDie(config)
 
-	nodeServer := node.NewNodeServer(identity, nodeID, *client, kube)
-	controllerServer, err := controller.NewControllerServer(identity, nodeID)
+	node.Initalize(basePath)
+	node := node.NewNodeServer(identity, nodeID, *client)
+	if err != nil {
+		return err
+	}
 
-	s := csicommon.NewNonBlockingGRPCServer()
-	s.Start(listen, idServer, controllerServer, nodeServer)
-	s.Wait()
+	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)
+	}
 
 	return nil
 }

deploy/workloads.yaml

@@ -189,39 +189,6 @@ spec:
             initialDelaySeconds: 10
             timeoutSeconds: 3
             periodSeconds: 2
-        - name: ephemeral-controller-cosi
-          image: $(REPOSITORY_ORG)/$(REPOSITORY_IMAGE):$(VERSION)
-          imagePullPolicy: "Always"
-          args:
-            - "--v=5"
-            - "--identity=driver.objectstorage.k8s.io"
-            - "--listen=$(CSI_ENDPOINT)"
-            - "--node-id=$(KUBE_NODE_NAME)"
-            - "--protocol=unix"
-          env:
-            - name: CSI_ENDPOINT
-              value: unix:///csi/csi.sock
-            - name: KUBE_NODE_NAME
-              valueFrom:
-                fieldRef:
-                  apiVersion: v1
-                  fieldPath: spec.nodeName
-          securityContext:
-            # This is necessary only for systems with SELinux, where
-            # non-privileged sidecar containers cannot access unix domain socket
-            # created by privileged CSI driver container.
-            privileged: true
-          ports:
-          - containerPort: 9898
-            name: healthz
-            protocol: TCP
-          terminationMessagePolicy: FallbackToLogsOnError
-          terminationMessagePath: /tmp/controller-termination-log
-          volumeMounts:
-            - mountPath: /dev
-              name: dev-dir
-            - mountPath: /csi
-              name: socket-dir
       volumes:
         - hostPath:
             path: $(KUBELET_DIR_PATH)/plugins/ephemeral-controller-cosi

go.mod

@@ -10,9 +10,8 @@ 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
@@ -30,7 +29,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