Use csi-lib-iscsi

This change converts the iscsi node calls to use the csi-lib-iscsi
package instead of copying out the existing K8s iscsi modules.

We attempt to maintain backward compatability and feature parity here,
but there are some slight changes to the parameters used (portals,
replaces `targetPortal` and `Portals`), we don't create unique iqn's for
each volume.

README.md

@@ -20,7 +20,7 @@ $ csc identity plugin-info --endpoint tcp://127.0.0.1:10000
 ```
 $ export ISCSI_TARGET="iSCSI Target Server IP (Ex: 10.10.10.10)"
 $ export IQN="Target IQN"
-$ csc node publish --endpoint tcp://127.0.0.1:10000 --target-path /mnt/iscsi --attrib targetPortal=$ISCSI_TARGET --attrib iqn=$IQN --attrib lun=<lun-id> iscsitestvol
+$ csc node publish --endpoint tcp://127.0.0.1:10000 --target-path /mnt/iscsi --attrib portals=$ISCSI_TARGET --attrib iqn=$IQN --attrib lun=<lun-id> --log-level=debug iscsitestvol
 iscsitestvol
 ```
 

cmd/iscsiplugin/main.go

@@ -27,8 +27,9 @@ import (
 )
 
 var (
-	endpoint string
-	nodeID   string
+	endpoint        string
+	nodeID          string
+	iscsiPersistDir string
 )
 
 func init() {
@@ -55,6 +56,9 @@ func main() {
 	cmd.PersistentFlags().StringVar(&endpoint, "endpoint", "", "CSI endpoint")
 	cmd.MarkPersistentFlagRequired("endpoint")
 
+	cmd.PersistentFlags().StringVar(&iscsiPersistDir, "iscsiPersistDir", "/var/lib/kubernetes/iscsi-persist", "directory to write iscsi connection persistence file")
+	cmd.ParseFlags(os.Args[1:])
+
 	if err := cmd.Execute(); err != nil {
 		fmt.Fprintf(os.Stderr, "%s", err.Error())
 		os.Exit(1)
@@ -65,5 +69,5 @@ func main() {
 
 func handle() {
 	d := iscsi.NewDriver(nodeID, endpoint)
-	d.Run()
+	d.Run(iscsiPersistDir)
 }

pkg/iscsi/connection.go

@@ -0,0 +1,127 @@
+package iscsi
+
+import (
+	"encoding/json"
+	"fmt"
+	"strconv"
+	"strings"
+
+	"github.com/container-storage-interface/spec/lib/go/csi"
+	iscsi_lib "github.com/kubernetes-csi/csi-lib-iscsi/iscsi"
+)
+
+// parseSecret unmarshalls out the provided json secret and attempts to build an iscsi_lib.Secret
+// returns empty secret and nil error if secretParams == ""
+func parseSecret(secretParams string) (iscsi_lib.Secrets, error) {
+	secret := iscsi_lib.Secrets{}
+	if secretParams == "" {
+		return secret, nil
+	}
+
+	if err := json.Unmarshal([]byte(secretParams), &secret); err != nil {
+		return secret, err
+	}
+	secret.SecretsType = "chap"
+	return secret, nil
+}
+
+// ensureTargetPort checks if the specified target address includes a port, if it doesn't it appends the default 3260
+func ensureTargetPort(p string) string {
+	if !strings.Contains(p, ":") {
+		p = p + ":3260"
+	}
+	return p
+
+}
+
+// buildPortalList takes the []byte target portal input from the create request and converts it to a proper []string with iscsi port
+func buildPortalList(pList []byte) ([]string, error) {
+	var p []string
+	portals := []string{}
+
+	if err := json.Unmarshal(pList, &portals); err != nil {
+		return nil, err
+	}
+	for _, portal := range portals {
+		p = append(p, ensureTargetPort(string(portal)))
+	}
+	return p, nil
+}
+
+// processChapSettings takes the provides NodePublishVolumeRequest and sets up the necessary CHAP settings, and returns them
+func processChapSettings(req *csi.NodePublishVolumeRequest) (iscsi_lib.Secrets, iscsi_lib.Secrets, error) {
+	chapDiscovery := false
+	// For CHAP secrets we're expecting the form (revisit this):
+	//   userName: xxx, password: xxx, userNameIn: xxx, passwordIn: xxx
+	// NOTE: parseSecret will check for empy session/discovery secret parameters in the req when processing
+	// and return empty secret and nil err
+	sessionSecret, err := parseSecret(req.GetVolumeContext()["sessionSecret"])
+	if err != nil {
+		return iscsi_lib.Secrets{}, iscsi_lib.Secrets{}, err
+	}
+
+	discoverySecret, err := parseSecret(req.GetVolumeContext()["discoverySecret"])
+	if err != nil {
+		return iscsi_lib.Secrets{}, iscsi_lib.Secrets{}, err
+	}
+
+	if req.GetVolumeContext()["discoveryCHAPAuth"] == "true" {
+		if discoverySecret == (iscsi_lib.Secrets{}) {
+			return iscsi_lib.Secrets{}, iscsi_lib.Secrets{}, fmt.Errorf("CHAP discovery was enabled, however no discoverySecret was provided")
+
+		}
+		chapDiscovery = true
+	}
+
+	// We require that if you enable CHAP it's used for sessions, in other words we don't allow settign it for discovery only
+	if req.GetVolumeContext()["sessionCHAPAuth"] == "true" || chapDiscovery {
+		if sessionSecret == (iscsi_lib.Secrets{}) {
+			return iscsi_lib.Secrets{}, iscsi_lib.Secrets{}, fmt.Errorf("CHAP session was enabled, however no sessionSecret was provided")
+
+		}
+	}
+	return discoverySecret, sessionSecret, nil
+}
+
+// buildISCSIConnector takes a NodePublishVolumeRequest and attempts to build a valid connector from it
+func buildISCSIConnector(req *csi.NodePublishVolumeRequest) (*iscsi_lib.Connector, error) {
+	tiqn := req.GetVolumeContext()["iqn"]
+	lun := req.GetVolumeContext()["lun"]
+	portals := req.GetVolumeContext()["portals"]
+	pList := strings.Split(portals, ",")
+	if len(pList) < 1 || tiqn == "" || lun == "" {
+		return nil, fmt.Errorf("unable to create connection, missing required target information: targetPortal, iqn and lun")
+	}
+
+	discoverySecret, sessionSecret, err := processChapSettings(req)
+	if err != nil {
+		return nil, err
+	}
+
+	// prelim checks are good, let's parse everything out and build the connector
+	c := iscsi_lib.Connector{
+		VolumeName:    req.GetVolumeId(),
+		TargetIqn:     tiqn,
+		TargetPortals: pList,
+	}
+
+	if lun != "" {
+		l, err := strconv.Atoi(lun)
+		if err != nil {
+			return nil, err
+		}
+		c.Lun = int32(l)
+	}
+
+	if sessionSecret != (iscsi_lib.Secrets{}) {
+		c.SessionSecrets = sessionSecret
+		if discoverySecret != (iscsi_lib.Secrets{}) {
+			c.DiscoverySecrets = discoverySecret
+		}
+
+	}
+	if len(portals) > 1 {
+		c.Multipath = true
+	}
+	return &c, nil
+}

pkg/iscsi/driver.go

@@ -17,6 +17,8 @@ limitations under the License.
 package iscsi
 
 import (
+	"os"
+
 	"github.com/container-storage-interface/spec/lib/go/csi"
 	"github.com/golang/glog"
 
@@ -39,7 +41,8 @@ const (
 )
 
 var (
-	version = "1.0.0-rc2"
+	version         = "1.0.0-rc2"
+	iscsiPersistDir = "/var/lib/kubernetes/iscsi-persist"
 )
 
 func NewDriver(nodeID, endpoint string) *driver {
@@ -63,6 +66,10 @@ func NewNodeServer(d *driver) *nodeServer {
 	}
 }
 
-func (d *driver) Run() {
+func (d *driver) Run(persistFiles string) {
+	if persistFiles == "" {
+		iscsiPersistDir = persistFiles
+		os.MkdirAll(iscsiPersistDir, 0750)
+	}
 	csicommon.RunNodePublishServer(d.endpoint, d.csiDriver, NewNodeServer(d))
 }