Updated MooseFS client to version 4.58.1

Author: xandrus

.github/workflows/build-docker-images.yml

@@ -7,7 +7,7 @@ on:
 
 env:
   REGISTRY_IMAGE: moosefs/moosefs-csi
-  MFS_CLIENT: 4.58.0 
+  MFS_CLIENT: 4.58.1 
   CSI_VERSION: 0.9.8
 
 jobs:

Makefile

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-MFS_VERSION = "4.58.0"
+MFS_VERSION = "4.58.1"
 CSI_VERSION ?= "0.9.8"
 
 MFS_TAG=$(CSI_VERSION)-$(MFS_VERSION)
@@ -30,7 +30,7 @@ compile:
 
 build-dev:
 	@echo "==> Building DEV CSI images"
-	@docker build --no-cache -t moosefs/$(NAME):dev -t moosefs/$(NAME):$(DEV_TAG) --build-arg MFS_TAG=v$(MFS_VERSION) --build-arg CSI_TAG=dev cmd/moosefs-csi-plugin
+	@docker build --no-cache -t moosefs/$(NAME):dev -t moosefs/$(NAME):$(DEV_TAG) --build-arg MFS_TAG=v$(MFS_VERSION) --build-arg CSI_TAG=dev --file cmd/moosefs-csi-plugin/dev.Dockerfile .
 
 push-dev:
 	@echo "==> Publishing DEV CSI image on hub.docker.com: moosefs/$(NAME):$(DEV_TAG)"
@@ -47,7 +47,7 @@ push-prod:
 
 dev-buildx:
 	@echo "==> Using buildx to build and publish dev image"
-	@docker buildx build --no-cache --push --platform linux/amd64,linux/arm64,linux/arm/v7 --build-arg MFS_TAG=v$(MFS_VERSION) --build-arg CSI_TAG=dev -t moosefs/$(NAME):dev -t moosefs/$(NAME):$(DEV_TAG) cmd/moosefs-csi-plugin
+	@docker buildx build --no-cache --push --platform linux/amd64,linux/arm64,linux/arm/v7 --build-arg MFS_TAG=v$(MFS_VERSION) --build-arg CSI_TAG=dev -t moosefs/$(NAME):dev -t moosefs/$(NAME):$(DEV_TAG) --file cmd/moosefs-csi-plugin/dev.Dockerfile .
 
 prod-buildx:
 	@echo "==> Using buildx to build and publish production image"

cmd/moosefs-csi-plugin/Dockerfile

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 ARG CSI_TAG="v0.9.8"
-ARG MFS_TAG="v4.58.0"
+ARG MFS_TAG="v4.58.1"
 
 #Build MooseFS CSI driver from source
 FROM golang:1.25-alpine3.22 AS csibuilder

cmd/moosefs-csi-plugin/dev.Dockerfile

@@ -0,0 +1,41 @@
+# Copyright (c) 2025 Saglabs SA. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+ARG CSI_TAG="v0.9.8"
+ARG MFS_TAG="v4.58.1"
+
+#Build MooseFS CSI driver from source
+FROM golang:1.25-alpine3.22 AS csibuilder
+WORKDIR /build
+ARG CSI_TAG
+RUN apk add --update git
+COPY ./ /build
+RUN CGO_ENABLED=0 GOCACHE=/tmp/go-cache GOOS=linux go build -a -o /build/moosefs-csi-plugin cmd/moosefs-csi-plugin/main.go
+
+# MooseFS client is required for the CSI driver to mount volumes
+FROM moosefs/mfsbuilder:alpine3.22 AS mfsbuilder
+WORKDIR /moosefs
+ARG MFS_TAG
+RUN git clone --depth 1 --branch ${MFS_TAG} https://github.com/moosefs/moosefs.git /moosefs
+RUN autoreconf -f -i
+RUN ./configure --prefix=/usr --mandir=/share/man --sysconfdir=/etc --localstatedir=/var/lib --with-default-user=mfs --with-default-group=mfs --disable-mfsbdev --disable-mfsmaster --disable-mfschunkserver --disable-mfsmetalogger --disable-mfsnetdump --disable-mfscgi --disable-mfscgiserv --disable-mfscli
+RUN cd /moosefs/mfsclient && make DESTDIR=/tmp/ install
+
+#Build CSI plugin container
+FROM alpine:3.22
+RUN apk add --update fuse3-libs findmnt
+COPY --from=csibuilder /build/moosefs-csi-plugin /bin/moosefs-csi-plugin
+COPY --from=mfsbuilder /tmp/usr/bin /usr/bin
+RUN ["ln", "-s", "/usr/bin/mfsmount", "/usr/sbin/mount.moosefs"]
+ENTRYPOINT ["/bin/moosefs-csi-plugin"]

deploy/csi-moosefs.yaml

@@ -227,7 +227,7 @@ spec:
             capabilities:
               add: ["SYS_ADMIN"]
             allowPrivilegeEscalation: true
-          image: ghcr.io/moosefs/moosefs-csi:0.9.8-4.58.0
+          image: moosefs/moosefs-csi:0.9.8-4.58.1
           args:
             - "--mode=controller"
             - "--csi-endpoint=$(CSI_ENDPOINT)"
@@ -326,7 +326,7 @@ spec:
             capabilities:
               add: ["SYS_ADMIN"]
             allowPrivilegeEscalation: true
-          image: ghcr.io/moosefs/moosefs-csi:0.9.8-4.58.0
+          image: moosefs/moosefs-csi:0.9.8-4.58.1
           args:
             - "--mode=node"
             - "--csi-endpoint=$(CSI_ENDPOINT)"

driver/controller.go

@@ -79,7 +79,7 @@ func (cs *ControllerService) CreateVolume(ctx context.Context, req *csi.CreateVo
 	if req.Name == "" {
 		return nil, status.Error(codes.InvalidArgument, "CreateVolume: Name must be provided")
 	}
-	if req.VolumeCapabilities == nil || len(req.VolumeCapabilities) == 0 {
+	if len(req.VolumeCapabilities) == 0 {
 		return nil, status.Error(codes.InvalidArgument, "CreateVolume: Volume capabilities must be provided")
 	}
 	requestedQuota, err := getRequestCapacity(req.CapacityRange)

driver/mfs_handler.go

@@ -30,17 +30,14 @@ import (
 )
 
 const (
-	fsType          = "moosefs"
-	newVolumeMode   = 0755
-	getQuotaCmd     = "mfsgetquota"
-	setQuotaCmd     = "mfssetquota"
-	quotaLimitType  = "-L"
-	quotaLimitRow   = 2
-	quotaLimitCol   = 3
-	logsDirName     = "logs"
-	volumesDirName  = "volumes"
-	mvolumesDirName = "mount_volumes"
-	mntDir          = "/mnt"
+	fsType         = "moosefs"
+	newVolumeMode  = 0755
+	getQuotaCmd    = "mfsgetquota"
+	setQuotaCmd    = "mfssetquota"
+	quotaLimitType = "-L"
+	logsDirName    = "logs"
+	volumesDirName = "volumes"
+	mntDir         = "/mnt"
 )
 
 // todo(ad): in future possibly add more options (mount options?)
@@ -210,15 +207,18 @@ func parseMfsQuotaToolsOutput(output string) (int64, error) {
 	lines := strings.Split(output, "\n")
 	ll := len(lines)
 
-	if ll == 8 {
-		// new mfsgetquota output format
+	switch ll {
+	case 8:
+		// mfssetquota new format output
 		cols = strings.Split(lines[ll-4], "|")
 		s = strings.TrimSpace(cols[4])
-	} else if ll == 6 {
-		// old mfsgetquota output format
+	case 6:
+		// mfsgetquota old format output
 		cols := strings.Split(lines[ll-4], "|")
 		s = strings.TrimSpace(cols[3])
-	} else {
+	case 0:
+		return -1, errors.New("error while parsing mfsgetquota tool output (empty output)")
+	default:
 		return -1, fmt.Errorf("error while parsing mfsgetquota tool output (unexpected number of lines); output: %s", output)
 	}
 

go.mod

@@ -1,15 +1,21 @@
 module github.com/moosefs/moosefs-csi
 
-go 1.14
+go 1.25
 
 require (
 	github.com/container-storage-interface/spec v1.4.0
 	github.com/golang/protobuf v1.4.3
 	github.com/sirupsen/logrus v1.8.0
+	google.golang.org/grpc v1.36.0
+	gopkg.in/natefinch/lumberjack.v2 v2.0.0
+)
+
+require (
+	github.com/magefile/mage v1.10.0 // indirect
 	golang.org/x/net v0.0.0-20200320220750-118fecf932d8 // indirect
 	golang.org/x/sys v0.0.0-20200321134203-328b4cd54aae // indirect
 	golang.org/x/text v0.3.2 // indirect
-	google.golang.org/grpc v1.36.0
-	gopkg.in/natefinch/lumberjack.v2 v2.0.0
+	google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 // indirect
+	google.golang.org/protobuf v1.25.0 // indirect
 	gopkg.in/yaml.v2 v2.2.5 // indirect
 )

go.sum

@@ -96,7 +96,6 @@ google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2
 google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 google.golang.org/protobuf v1.25.0 h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4c=
 google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/natefinch/lumberjack.v2 v2.0.0 h1:1Lc07Kr7qY4U2YPouBjpCLxpiyxIVoxqXgkXLknAOE8=
 gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k=