Merge pull request #99 from andyzhangx/refine

chore: remove iscsiplugin.sh in iscsi Dockerfile

Dockerfile

@@ -19,9 +19,7 @@ RUN clean-install util-linux e2fsprogs mount ca-certificates udev xfsprogs btrfs
 # install updated packages to fix CVE issues
 RUN clean-install libgmp10 bsdutils
 
-# Copy iscsiplugin.sh
-COPY iscsiplugin.sh /iscsiplugin.sh
-# Copy iscsiplugin from build _output directory
+CMD service iscsid start
 COPY ./bin/iscsiplugin /iscsiplugin
 
-ENTRYPOINT ["sh", "/iscsiplugin.sh"]
+ENTRYPOINT ["/iscsiplugin"]

deploy/csi-iscsi-driverinfo.yaml

@@ -7,3 +7,4 @@ spec:
   attachRequired: false
   volumeLifecycleModes:
     - Persistent
+    - Ephemeral

deploy/csi-iscsi-node.yaml

@@ -72,6 +72,8 @@ spec:
           image: gcr.io/k8s-staging-sig-storage/iscsiplugin:canary
           args:
             - "--nodeid=$(NODE_ID)"
+            - "--endpoint=$(CSI_ENDPOINT)"
+            - "--v=5"
           env:
             - name: NODE_ID
               valueFrom:

pkg/iscsi/iscsi.go

@@ -38,7 +38,6 @@ func getISCSIInfo(req *csi.NodePublishVolumeRequest) (*iscsiDisk, error) {
 		return nil, fmt.Errorf("ISCSI target information is missing")
 	}
 
-	portalList := req.GetVolumeContext()["portals"]
 	secretParams := req.GetVolumeContext()["secret"]
 	secret := parseSecret(secretParams)
 	sessionSecret, err := parseSessionSecret(secret)
@@ -50,17 +49,20 @@ func getISCSIInfo(req *csi.NodePublishVolumeRequest) (*iscsiDisk, error) {
 		return nil, err
 	}
 
-	portal := portalMounter(tp)
-	var bkportal []string
-	bkportal = append(bkportal, portal)
+	bkportal := []string{}
 
-	portals := []string{}
-	if err := json.Unmarshal([]byte(portalList), &portals); err != nil {
-		return nil, err
-	}
+	portalList := req.GetVolumeContext()["portals"]
+	if len(portalList) > 0 {
+		portal := portalMounter(tp)
+		bkportal = append(bkportal, portal)
+		portals := []string{}
+		if err := json.Unmarshal([]byte(portalList), &portals); err != nil {
+			return nil, err
+		}
 
-	for _, portal := range portals {
-		bkportal = append(bkportal, portalMounter(portal))
+		for _, portal := range portals {
+			bkportal = append(bkportal, portalMounter(portal))
+		}
 	}
 
 	iface := req.GetVolumeContext()["iscsiInterface"]