kubernetes-csi/csi-driver-nfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #118 from saad-ali/updateCSI1.0.0

Browse Source 
Update drivers to pick up CSI 1.0.0
This commit is contained in:
k8s-ci-robot 2018-11-14 20:21:14 -08:00 committed by GitHub
commit dadd72a6f4
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/nfs/driver.go
View File

@ -17,7 +17,7 @@ limitations under the License.
package nfs package nfs
import ( 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/golang/glog"
"github.com/kubernetes-csi/drivers/pkg/csi-common" "github.com/kubernetes-csi/drivers/pkg/csi-common"
@ -39,7 +39,7 @@ const (
) )
var ( var (
version = "0.3.0" version = "1.0.0-rc2"
) )
func NewDriver(nodeID, endpoint string) *driver { func NewDriver(nodeID, endpoint string) *driver {

6
pkg/nfs/nodeserver.go
View File

@ -21,7 +21,7 @@ import (
"os" "os"
"strings" "strings"
"github.com/container-storage-interface/spec/lib/go/csi/v0" "github.com/container-storage-interface/spec/lib/go/csi"
"golang.org/x/net/context" "golang.org/x/net/context"
"google.golang.org/grpc/codes" "google.golang.org/grpc/codes"
"google.golang.org/grpc/status" "google.golang.org/grpc/status"
@ -58,8 +58,8 @@ func (ns *nodeServer) NodePublishVolume(ctx context.Context, req *csi.NodePublis
mo = append(mo, "ro") mo = append(mo, "ro")
} }
s := req.GetVolumeAttributes()["server"] s := req.GetVolumeContext()["server"]
ep := req.GetVolumeAttributes()["share"] ep := req.GetVolumeContext()["share"]
source := fmt.Sprintf("%s:%s", s, ep) source := fmt.Sprintf("%s:%s", s, ep)
mounter := mount.New("") mounter := mount.New("")