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

Merge pull request #254 from andyzhangx/fix-version

Browse Source 
fix: driver version print in logging
This commit is contained in:
Kubernetes Prow Robot 2021-12-07 06:54:02 -08:00 committed by GitHub
commit 77e220d007
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/nfsplugin/main.go
View File

@ -62,6 +62,6 @@ func handle() {
parsedPerm = &permu32 parsedPerm = &permu32
} }
d := nfs.NewNFSdriver(*nodeID, *driverName, *endpoint, parsedPerm) d := nfs.NewDriver(*nodeID, *driverName, *endpoint, parsedPerm)
d.Run(false) d.Run(false)
} }

2
hack/release-image.sh
View File

@ -28,7 +28,7 @@ export IMAGENAME=public/k8s/csi/nfs-csi
export CI=1 export CI=1
export PUBLISH=1 export PUBLISH=1
az acr login --name $REGISTRY_NAME az acr login --name $REGISTRY_NAME
make container push push-latest make && make container push push-latest
echo "sleep 60s ..." echo "sleep 60s ..."
sleep 60 sleep 60

2
pkg/nfs/controllerserver_test.go
View File

@ -49,7 +49,7 @@ var (
func initTestController(t *testing.T) *ControllerServer { func initTestController(t *testing.T) *ControllerServer {
var perm *uint32 var perm *uint32
mounter := &mount.FakeMounter{MountPoints: []mount.MountPoint{}} mounter := &mount.FakeMounter{MountPoints: []mount.MountPoint{}}
driver := NewNFSdriver("", "", "", perm) driver := NewDriver("", "", "", perm)
driver.ns = NewNodeServer(driver, mounter) driver.ns = NewNodeServer(driver, mounter)
cs := NewControllerServer(driver) cs := NewControllerServer(driver)
cs.workingMountDir = "/tmp" cs.workingMountDir = "/tmp"

13
pkg/nfs/nfs.go
View File

@ -52,16 +52,12 @@ const (
paramShare = "share" paramShare = "share"
) )
var ( func NewDriver(nodeID, driverName, endpoint string, perm *uint32) *Driver {
version = "3.0.0" klog.V(2).Infof("Driver: %v version: %v", driverName, driverVersion)
)
func NewNFSdriver(nodeID, driverName, endpoint string, perm *uint32) *Driver {
klog.Infof("Driver: %v version: %v", driverName, version)
n := &Driver{ n := &Driver{
name: driverName, name: driverName,
version: version, version: driverVersion,
nodeID: nodeID, nodeID: nodeID,
endpoint: endpoint, endpoint: endpoint,
cap: map[csi.VolumeCapability_AccessMode_Mode]bool{}, cap: map[csi.VolumeCapability_AccessMode_Mode]bool{},
@ -79,9 +75,6 @@ func NewNFSdriver(nodeID, driverName, endpoint string, perm *uint32) *Driver {
} }
n.AddVolumeCapabilityAccessModes(vcam) n.AddVolumeCapabilityAccessModes(vcam)
// NFS plugin does not support ControllerServiceCapability now.
// If support is added, it should set to appropriate
// ControllerServiceCapability RPC types.
n.AddControllerServiceCapabilities([]csi.ControllerServiceCapability_RPC_Type{ n.AddControllerServiceCapabilities([]csi.ControllerServiceCapability_RPC_Type{
csi.ControllerServiceCapability_RPC_CREATE_DELETE_VOLUME, csi.ControllerServiceCapability_RPC_CREATE_DELETE_VOLUME,
csi.ControllerServiceCapability_RPC_SINGLE_NODE_MULTI_WRITER, csi.ControllerServiceCapability_RPC_SINGLE_NODE_MULTI_WRITER,

4
pkg/nfs/nfs_test.go
View File

@ -45,7 +45,7 @@ func NewEmptyDriver(emptyField string) *Driver {
case "name": case "name":
d = &Driver{ d = &Driver{
name: "", name: "",
version: version, version: driverVersion,
nodeID: fakeNodeID, nodeID: fakeNodeID,
cap: map[csi.VolumeCapability_AccessMode_Mode]bool{}, cap: map[csi.VolumeCapability_AccessMode_Mode]bool{},
perm: perm, perm: perm,
@ -53,7 +53,7 @@ func NewEmptyDriver(emptyField string) *Driver {
default: default:
d = &Driver{ d = &Driver{
name: DefaultDriverName, name: DefaultDriverName,
version: version, version: driverVersion,
nodeID: fakeNodeID, nodeID: fakeNodeID,
cap: map[csi.VolumeCapability_AccessMode_Mode]bool{}, cap: map[csi.VolumeCapability_AccessMode_Mode]bool{},
perm: perm, perm: perm,

2
test/e2e/e2e_suite_test.go
View File

@ -68,7 +68,7 @@ var _ = ginkgo.BeforeSuite(func() {
handleFlags() handleFlags()
framework.AfterReadingAllFlags(&framework.TestContext) framework.AfterReadingAllFlags(&framework.TestContext)
nfsDriver = nfs.NewNFSdriver(nodeID, nfs.DefaultDriverName, fmt.Sprintf("unix:///tmp/csi-%s.sock", uuid.NewUUID().String()), perm) nfsDriver = nfs.NewDriver(nodeID, nfs.DefaultDriverName, fmt.Sprintf("unix:///tmp/csi-%s.sock", uuid.NewUUID().String()), perm)
controllerServer = nfs.NewControllerServer(nfsDriver) controllerServer = nfs.NewControllerServer(nfsDriver)
// install nfs server // install nfs server