Merge pull request #1 from houz42/master

use go mod, and minor fixes

.github/workflows/image.yaml

@@ -0,0 +1,48 @@
+name: csi-huawei image
+on:
+  push:
+    branches:
+      - master
+    tags:
+      - v*.*.*
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: checkout repo
+        uses: actions/checkout@v2
+
+      - name: login to docker hub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKER_HUB_USERNAME }}
+          password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
+
+      - name: set up docker buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v1
+
+      - name: Cache Docker layers
+        uses: actions/cache@v2
+        with:
+          path: /tmp/.buildx-cache
+          key: ${{ runner.os }}-buildx-${{ github.sha }}
+          restore-keys: |
+            ${{ runner.os }}-buildx-
+
+      - id: image_meta
+        uses: crazy-max/ghaction-docker-meta@v1
+        with:
+          images: $GITHUB_ACTOR/csi-huawei # list of Docker images to use as base name for tags
+          tag-sha: true # add git short SHA as Docker tag
+
+      - name: build driver
+        id: docker_build_s3_driver
+        uses: docker/build-push-action@v2
+        with:
+          context: ./
+          file: Dockerfile
+          push: true
+          tags: ${{ steps.image_meta.outputs.tags }}
+          labels: ${{ steps.image_meta.outputs.labels }}

Dockerfile

@@ -0,0 +1,9 @@
+FROM golang:alpine AS builder
+
+WORKDIR /src
+COPY . /src/
+RUN go build -o bin/huawei-csi ./src/csi
+
+FROM alpine
+COPY --from=builder /src/bin/huawei-csi /huawei-csi
+ENTRYPOINT [ "/huawei-csi" ]

go.mod

@@ -0,0 +1,13 @@
+module github.com/Huawei/eSDK_K8S_Plugin
+
+go 1.15
+
+require (
+	github.com/container-storage-interface/spec v1.3.0
+	github.com/golang/protobuf v1.4.3
+	github.com/sirupsen/logrus v1.7.0
+	golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad
+	golang.org/x/sys v0.0.0-20210104204734-6f8348627aad
+	google.golang.org/grpc v1.34.0
+	k8s.io/apimachinery v0.20.1
+)

src/connector/connector.go

@@ -2,7 +2,8 @@ package connector
 
 import (
 	"fmt"
-	"utils/log"
+
+	"github.com/Huawei/eSDK_K8S_Plugin/src/utils/log"
 )
 
 const (

src/connector/connector_utils.go

@@ -6,8 +6,9 @@ import (
 	"regexp"
 	"strings"
 	"time"
-	"utils"
-	"utils/log"
+
+	"github.com/Huawei/eSDK_K8S_Plugin/src/utils"
+	"github.com/Huawei/eSDK_K8S_Plugin/src/utils/log"
 )
 
 func GetDevice(findDeviceMap map[string]string, tgtLunGuid string) (string, error) {

src/connector/fibrechannel/fc.go

@@ -1,12 +1,13 @@
 package fibrechannel
 
 import (
-	"connector"
-	"dev"
 	"errors"
 	"fmt"
 	"time"
-	"utils/log"
+
+	"github.com/Huawei/eSDK_K8S_Plugin/src/connector"
+	"github.com/Huawei/eSDK_K8S_Plugin/src/dev"
+	"github.com/Huawei/eSDK_K8S_Plugin/src/utils/log"
 )
 
 type FibreChannel struct{}

src/connector/fibrechannel/fc_helper.go

@@ -1,8 +1,8 @@
 package fibrechannel
 
 import (
-	"utils"
-	"utils/log"
+	"github.com/Huawei/eSDK_K8S_Plugin/src/utils"
+	"github.com/Huawei/eSDK_K8S_Plugin/src/utils/log"
 )
 
 func scanHost() {

src/connector/iscsi/iscsi.go

@@ -1,11 +1,12 @@
 package iscsi
 
 import (
-	"connector"
-	"dev"
 	"strings"
 	"time"
-	"utils/log"
+
+	"github.com/Huawei/eSDK_K8S_Plugin/src/connector"
+	"github.com/Huawei/eSDK_K8S_Plugin/src/dev"
+	"github.com/Huawei/eSDK_K8S_Plugin/src/utils/log"
 )
 
 type iSCSI struct{}

src/connector/iscsi/iscsi_helper.go

@@ -1,16 +1,17 @@
 package iscsi
 
 import (
-	"connector"
 	"errors"
 	"fmt"
 	"math"
 	"runtime/debug"
 	"strings"
 	"sync"
 	"time"
-	"utils"
-	"utils/log"
+
+	"github.com/Huawei/eSDK_K8S_Plugin/src/connector"
+	"github.com/Huawei/eSDK_K8S_Plugin/src/utils"
+	"github.com/Huawei/eSDK_K8S_Plugin/src/utils/log"
 )
 
 type connectorInfo struct {
@@ -203,8 +204,7 @@ func findTgtMultiPath(lenIndex int, iscsiShareData *shareData, conn *connectorIn
 	var wwnAdded bool
 	var lastTryOn int64
 	for {
-		if (int64(lenIndex) == iscsiShareData.stoppedThreads && iscsiShareData.foundDevices == nil) || (
-			mPath != "" && int64(lenIndex) == iscsiShareData.numLogin+iscsiShareData.failedLogin) {
+		if (int64(lenIndex) == iscsiShareData.stoppedThreads && iscsiShareData.foundDevices == nil) || (mPath != "" && int64(lenIndex) == iscsiShareData.numLogin+iscsiShareData.failedLogin) {
 			break
 		}
 
@@ -239,7 +239,7 @@ func tryConnectVolume(connMap map[string]interface{}) (string, error) {
 		return "", err
 	}
 
-    // must ignore the error
+	// must ignore the error
 	allSessions, _ := utils.ExecShellCmd("iscsiadm -m session")
 
 	var mPath string

src/connector/nvme/nvme.go

@@ -1,11 +1,12 @@
 package nvme
 
 import (
-	"connector"
 	"errors"
 	"fmt"
 	"time"
-	"utils/log"
+
+	"github.com/Huawei/eSDK_K8S_Plugin/src/connector"
+	"github.com/Huawei/eSDK_K8S_Plugin/src/utils/log"
 )
 
 type FCNVMe struct{}
@@ -22,7 +23,7 @@ func (fc *FCNVMe) ConnectVolume(conn map[string]interface{}) (string, error) {
 		log.Errorln(msg)
 		return "", errors.New(msg)
 	}
-	connectInfo := map[string]interface{} {
+	connectInfo := map[string]interface{}{
 		"protocol": "fc",
 	}
 	connector.ScanNVMe(connectInfo)

src/connector/roce/roce.go

@@ -1,10 +1,11 @@
 package roce
 
 import (
-	"connector"
 	"strings"
 	"time"
-	"utils/log"
+
+	"github.com/Huawei/eSDK_K8S_Plugin/src/connector"
+	"github.com/Huawei/eSDK_K8S_Plugin/src/utils/log"
 )
 
 type RoCE struct{}

src/connector/roce/roce_helper.go

@@ -1,20 +1,21 @@
 package roce
 
 import (
-	"connector"
 	"errors"
 	"fmt"
 	"math"
 	"runtime/debug"
 	"strings"
 	"sync"
 	"time"
-	"utils"
-	"utils/log"
+
+	"github.com/Huawei/eSDK_K8S_Plugin/src/connector"
+	"github.com/Huawei/eSDK_K8S_Plugin/src/utils"
+	"github.com/Huawei/eSDK_K8S_Plugin/src/utils/log"
 )
 
 type connectorInfo struct {
-	tgtPortals []string
+	tgtPortals  []string
 	tgtLunGuids []string
 }
 
@@ -97,8 +98,8 @@ func singleConnectVolume(allSessions, tgtPortal, tgtLunGuid string, nvmeShareDat
 		nvmeShareData.failedLogin += 1
 	} else {
 		nvmeShareData.numLogin += 1
-		connectInfo := map[string]interface{} {
-			"protocol": "iscsi",
+		connectInfo := map[string]interface{}{
+			"protocol":  "iscsi",
 			"targetNqn": tgtNqn,
 		}
 		for i := 1; i < 4; i++ {
@@ -165,8 +166,7 @@ func findTgtMultiPath(lenIndex int, nvmeShareData *shareData, conn *connectorInf
 	var mPath string
 	var lastTryOn int64
 	for {
-		if (int64(lenIndex) == nvmeShareData.stoppedThreads && nvmeShareData.foundDevices == nil) || (
-			mPath != "" && int64(lenIndex) == nvmeShareData.numLogin+nvmeShareData.failedLogin) {
+		if (int64(lenIndex) == nvmeShareData.stoppedThreads && nvmeShareData.foundDevices == nil) || (mPath != "" && int64(lenIndex) == nvmeShareData.numLogin+nvmeShareData.failedLogin) {
 			break
 		}
 

src/csi/backend/backend.go

@@ -1,13 +1,14 @@
 package backend
 
 import (
-	"csi/backend/plugin"
 	"errors"
 	"fmt"
 	"regexp"
 	"sync"
-	"utils"
-	"utils/log"
+
+	"github.com/Huawei/eSDK_K8S_Plugin/src/csi/backend/plugin"
+	"github.com/Huawei/eSDK_K8S_Plugin/src/utils"
+	"github.com/Huawei/eSDK_K8S_Plugin/src/utils/log"
 )
 
 var (
@@ -168,8 +169,7 @@ func updateMetroBackends() {
 				continue
 			}
 
-			if (i.MetroDomain != "" && i.MetroDomain == j.MetroDomain) || (
-				i.MetrovStorePairID != "" && i.MetrovStorePairID == j.MetrovStorePairID) {
+			if (i.MetroDomain != "" && i.MetroDomain == j.MetroDomain) || (i.MetrovStorePairID != "" && i.MetrovStorePairID == j.MetrovStorePairID) {
 				i.MetroBackend, j.MetroBackend = j, i
 				i.Plugin.UpdateMetroRemotePlugin(j.Plugin)
 				j.Plugin.UpdateMetroRemotePlugin(i.Plugin)

src/csi/backend/capability.go

@@ -6,7 +6,8 @@ import (
 	"os"
 	"runtime/debug"
 	"sync"
-	"utils/log"
+
+	"github.com/Huawei/eSDK_K8S_Plugin/src/utils/log"
 )
 
 func updateBackendCapabilities(backend *Backend, sync bool) error {

src/csi/backend/plugin/fusionstorage-nas.go

@@ -1,18 +1,19 @@
 package plugin
 
 import (
-	"dev"
 	"errors"
 	"fmt"
 	"net"
-	"storage/fusionstorage/volume"
-	"utils"
-	"utils/log"
+
+	"github.com/Huawei/eSDK_K8S_Plugin/src/dev"
+	"github.com/Huawei/eSDK_K8S_Plugin/src/storage/fusionstorage/volume"
+	"github.com/Huawei/eSDK_K8S_Plugin/src/utils"
+	"github.com/Huawei/eSDK_K8S_Plugin/src/utils/log"
 )
 
 type FusionStorageNasPlugin struct {
 	FusionStoragePlugin
-	portal   string
+	portal string
 }
 
 func init() {

src/csi/backend/plugin/fusionstorage-san.go

@@ -1,16 +1,17 @@
 package plugin
 
 import (
-	"dev"
 	"errors"
 	"fmt"
 	"net"
-	"proto"
-	"storage/fusionstorage/attacher"
-	"storage/fusionstorage/volume"
 	"strings"
-	"utils"
-	"utils/log"
+
+	"github.com/Huawei/eSDK_K8S_Plugin/src/dev"
+	"github.com/Huawei/eSDK_K8S_Plugin/src/proto"
+	"github.com/Huawei/eSDK_K8S_Plugin/src/storage/fusionstorage/attacher"
+	"github.com/Huawei/eSDK_K8S_Plugin/src/storage/fusionstorage/volume"
+	"github.com/Huawei/eSDK_K8S_Plugin/src/utils"
+	"github.com/Huawei/eSDK_K8S_Plugin/src/utils/log"
 )
 
 type FusionStorageSanPlugin struct {