Fresh dep ensure

This commit is contained in:
Mike Cronce
2018-11-26 13:23:56 -05:00
parent 93cb8a04d7
commit 407478ab9a
9016 changed files with 551394 additions and 279685 deletions

View File

@ -17,7 +17,7 @@ limitations under the License.
package iscsi
import (
"github.com/container-storage-interface/spec/lib/go/csi/v0"
"github.com/container-storage-interface/spec/lib/go/csi"
"github.com/golang/glog"
"github.com/kubernetes-csi/drivers/pkg/csi-common"
@ -39,7 +39,7 @@ const (
)
var (
version = "0.3.0"
version = "1.0.0-rc2"
)
func NewDriver(nodeID, endpoint string) *driver {

View File

@ -21,22 +21,22 @@ import (
"fmt"
"strings"
"github.com/container-storage-interface/spec/lib/go/csi/v0"
"github.com/container-storage-interface/spec/lib/go/csi"
"k8s.io/kubernetes/pkg/util/mount"
"k8s.io/kubernetes/pkg/volume/util"
)
func getISCSIInfo(req *csi.NodePublishVolumeRequest) (*iscsiDisk, error) {
volName := req.GetVolumeId()
tp := req.GetVolumeAttributes()["targetPortal"]
iqn := req.GetVolumeAttributes()["iqn"]
lun := req.GetVolumeAttributes()["lun"]
tp := req.GetVolumeContext()["targetPortal"]
iqn := req.GetVolumeContext()["iqn"]
lun := req.GetVolumeContext()["lun"]
if tp == "" || iqn == "" || lun == "" {
return nil, fmt.Errorf("iSCSI target information is missing")
}
portalList := req.GetVolumeAttributes()["portals"]
secretParams := req.GetVolumeAttributes()["secret"]
portalList := req.GetVolumeContext()["portals"]
secretParams := req.GetVolumeContext()["secret"]
secret := parseSecret(secretParams)
portal := portalMounter(tp)
@ -52,15 +52,15 @@ func getISCSIInfo(req *csi.NodePublishVolumeRequest) (*iscsiDisk, error) {
bkportal = append(bkportal, portalMounter(string(portal)))
}
iface := req.GetVolumeAttributes()["iscsiInterface"]
initiatorName := req.GetVolumeAttributes()["initiatorName"]
iface := req.GetVolumeContext()["iscsiInterface"]
initiatorName := req.GetVolumeContext()["initiatorName"]
chapDiscovery := false
if req.GetVolumeAttributes()["discoveryCHAPAuth"] == "true" {
if req.GetVolumeContext()["discoveryCHAPAuth"] == "true" {
chapDiscovery = true
}
chapSession := false
if req.GetVolumeAttributes()["sessionCHAPAuth"] == "true" {
if req.GetVolumeContext()["sessionCHAPAuth"] == "true" {
chapSession = true
}

View File

@ -17,7 +17,7 @@ limitations under the License.
package iscsi
import (
"github.com/container-storage-interface/spec/lib/go/csi/v0"
"github.com/container-storage-interface/spec/lib/go/csi"
"golang.org/x/net/context"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"