Split controller and node binaries

.gitignore

@@ -1,3 +1,6 @@
+# local build dir
+build
+
 # go coverage data
 profile.cov
 

build.sh

@@ -2,8 +2,8 @@
 
 set -e
 
-# Set driver name
-DRIVER="${DRIVER:-glusterfs-csi-driver}"
+# Set which drivers to build
+DRIVERS="${DRIVERS:-glusterfs-controller glusterfs-node}"
 
 # Set which docker repo to tag
 REPO="${REPO:-gluster/}"
@@ -38,17 +38,20 @@ build_args+=( --build-arg "builddate=$BUILDDATE" )
 echo "=== $RUNTIME_CMD version ==="
 $RUNTIME_CMD version
 
-#-- Build container
-$RUNTIME_CMD $build \
-        -t "${REPO}${DRIVER}" \
-        "${build_args[@]}" \
-        -f pkg/glusterfs/Dockerfile \
-        . \
-|| exit 1
-
-# If running tests, extract profile data
-if [ "$RUN_TESTS" -ne 0 ]; then
-        rm -f profile.cov
-        $RUNTIME_CMD run --entrypoint cat "${REPO}${DRIVER}" \
-                /profile.cov > profile.cov
-fi
+#-- Build containers
+for driver in ${DRIVERS}; do
+        $RUNTIME_CMD $build \
+                -t "${REPO}${driver}-csi-driver" \
+                --build-arg DRIVER="$driver" \
+                "${build_args[@]}" \
+                -f extras/Dockerfile \
+                . \
+        || exit 1
+
+        # If running tests, extract profile data
+        if [ "$RUN_TESTS" -ne 0 ]; then
+                rm -f profile.cov
+                $RUNTIME_CMD run --entrypoint cat "${REPO}${driver}-csi-driver" \
+                        /profile.cov > profile.cov
+        fi
+done

cmd/glusterfs-controller/main.go

@@ -0,0 +1,35 @@
+package main
+
+import (
+	"fmt"
+	"os"
+
+	"github.com/gluster/gluster-csi-driver/pkg/command"
+	"github.com/gluster/gluster-csi-driver/pkg/glusterfs"
+)
+
+// Driver Identifiers
+const (
+	cmdName          = "glusterfs-controller-driver"
+	CSIDriverDesc    = "GlusterFS (glusterd2) CSI Controller Driver"
+	CSIDriverName    = "org.gluster.glusterfs"
+	CSIDriverVersion = "0.0.9"
+)
+
+func init() {
+	command.Init()
+}
+
+func main() {
+	var config = command.NewConfig(cmdName, CSIDriverName, CSIDriverVersion, CSIDriverDesc)
+
+	d := glusterfs.New(config)
+	if d == nil {
+		fmt.Println("Failed to initialize GlusterFS CSI driver")
+		os.Exit(1)
+	}
+
+	cmd := command.InitCommand(config, d)
+
+	command.Run(config, cmd)
+}

cmd/glusterfs-node/main.go

@@ -0,0 +1,35 @@
+package main
+
+import (
+	"fmt"
+	"os"
+
+	"github.com/gluster/gluster-csi-driver/pkg/command"
+	"github.com/gluster/gluster-csi-driver/pkg/node"
+)
+
+// Driver Identifiers
+const (
+	cmdName          = "glusterfs-node-driver"
+	CSIDriverDesc    = "GlusterFS (glusterd2) CSI Node Driver"
+	CSIDriverName    = "org.gluster.glusterfs"
+	CSIDriverVersion = "0.0.9"
+)
+
+func init() {
+	command.Init()
+}
+
+func main() {
+	var config = command.NewConfig(cmdName, CSIDriverName, CSIDriverVersion, CSIDriverDesc)
+
+	d := node.New(config)
+	if d == nil {
+		fmt.Println("Failed to initialize GlusterFS CSI driver")
+		os.Exit(1)
+	}
+
+	cmd := command.InitCommand(config, d)
+
+	command.Run(config, cmd)
+}