Updated MooseFS client to version 4.58.0

Author: xandrus

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

@@ -4,116 +4,58 @@ on:
   push:
     branches:
       - master
-      - dev
 
 env:
   REGISTRY_IMAGE: moosefs/moosefs-csi
-  MFS_CLIENT: 4.57.7 
+  MFS_CLIENT: 4.58.0 
   CSI_VERSION: 0.9.8
 
 jobs:
-  build:
+  build-dockerhub:
     runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        platform:
-          - linux/amd64
-          - linux/arm64
-          - linux/arm/v7
     steps:
-      - name: Prepare
-        run: |
-          platform=${{ matrix.platform }}
-          echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV
-      
-      - name: Docker meta
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: ${{ env.REGISTRY_IMAGE }}
-          tags: |
-            type=ref,event=branch
-            type=raw,value=${{ env.CSI_VERSION }}-${{ env.MFS_CLIENT }}
-            type=raw,value=${{ env.CSI_VERSION }}-{{branch}}
-      
+      - name: Checkout
+        uses: actions/checkout@v4
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
-      
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
-      
-      - name: Login to GitHub Container Registry
+      - name: Login to Docker Hub
         uses: docker/login-action@v3
         with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GHCR_TOKEN }}
-      
-      - name: Build and push by digest MooseFS Client v4
-        id: build
-        uses: docker/build-push-action@v6
-        with:
-          file: ./cmd/moosefs-csi-plugin/Dockerfile
-          platforms: ${{ matrix.platform }}
-          labels: ${{ steps.meta.outputs.labels }}
-          outputs: type=image,name=ghcr.io/${{ env.REGISTRY_IMAGE }},push-by-digest=true,name-canonical=true,push=true
-          build-args: |
-            MFS_TAG=v${{ env.MFS_CLIENT }}
-            CSI_TAG=dev
-      
-      - name: Export digest
-        run: |
-          mkdir -p /tmp/digests
-          digest="${{ steps.build.outputs.digest }}"
-          touch "/tmp/digests/${digest#sha256:}"
-      
-      - name: Upload digest
-        uses: actions/upload-artifact@v4
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Build and push
+        uses: docker/build-push-action@v5
         with:
-          name: digests-${{ env.PLATFORM_PAIR }}
-          path: /tmp/digests/*
-          if-no-files-found: error
-          retention-days: 1
-
-  merge:
+          context: ./cmd/moosefs-csi-plugin
+          platforms: linux/amd64,linux/arm64,linux/arm/v7
+          push: true
+          tags: |
+            ${{ env.REGISTRY_IMAGE }}:${{ env.CSI_VERSION }}-${{ env.MFS_CLIENT }}
+            ${{ env.REGISTRY_IMAGE }}:latest
+  build-ghcr:
     runs-on: ubuntu-latest
-    needs:
-      - build
     steps:
-      - name: Download digests
-        uses: actions/download-artifact@v4
-        with:
-          path: /tmp/digests
-          pattern: digests-*
-          merge-multiple: true
-      
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
-      
-      - name: Docker meta
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: ghcr.io/${{ env.REGISTRY_IMAGE }}
-          tags: |
-            type=ref,event=branch
-            type=raw,value=${{ env.CSI_VERSION }}-${{ env.MFS_CLIENT }}
-            type=raw,value=${{ env.CSI_VERSION }}-{{branch}}
-      
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GHCR_TOKEN }}
-      
-      - name: Create manifest list and push
-        working-directory: /tmp/digests
-        run: |
-          docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
-            $(printf 'ghcr.io/${{ env.REGISTRY_IMAGE }}@sha256:%s ' *)
-      
-      - name: Inspect image
-        run: |
-          docker buildx imagetools inspect ghcr.io/${{ env.REGISTRY_IMAGE }}:${{ steps.meta.outputs.version }}
+      - name: Build and push
+        uses: docker/build-push-action@v5
+        with:
+          context: ./cmd/moosefs-csi-plugin
+          platforms: linux/amd64,linux/arm64,linux/arm/v7
+          push: true
+          tags: |
+            ${{ env.REGISTRY_IMAGE }}:${{ env.CSI_VERSION }}-${{ env.MFS_CLIENT }}
+            ${{ env.REGISTRY_IMAGE }}:latest
+      

Makefile

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-MFS_VERSION = "4.57.7"
+MFS_VERSION = "4.58.0"
 CSI_VERSION ?= "0.9.8"
 
 MFS_TAG=$(CSI_VERSION)-$(MFS_VERSION)

README.md

@@ -13,7 +13,8 @@ MooseFS source code can be found [on GitHub](https://github.com/moosefs/moosefs)
 ## Changelog
 
 Driver verson 0.9.8
-* MooseFS client updated to version 4.57.6.
+* MooseFS client updated to version 4.58.0.
+* Image OS changed to Alpine Linux 3.22
 * The provisioner and registrar images entries have been updated.
 * Update the Dockerfile to build only mfsmount and mfscli.
 
@@ -63,15 +64,15 @@ Driver verson 0.9.7
     * Locate image definition under the `csi-moosefs-plugin` plugin name(line 230 and line 329)
       `mage: ghcr.io/moosefs/moosefs-csi:dev`
     * Update the `image` version suffix in the plugin's section accordingly:
-        * `0.9.8-4.57.6`       – plugin version 0.9.7 and MooseFS CE 4.57.6
-        * `0.9.7-4.57.5`       – plugin version 0.9.7 and MooseFS CE 4.57.5
-        * `0.9.7-4.56.6`       – plugin version 0.9.7 and MooseFS CE 4.56.6
+        * `0.9.8-4.58.0`       – plugin version 0.9.8 and MooseFS CE 4.58.0
+        * `0.9.8-4.57.7`       – plugin version 0.9.8 and MooseFS CE 4.57.6
+        * `0.9.7-4.57.6`       – plugin version 0.9.7 and MooseFS CE 4.57.5
 
       You can find a complete list of available images at: \
       https://github.com/moosefs/moosefs-csi/pkgs/container/moosefs-csi
 
       Fot driver with MoosreFS client PRO version: https://registry.moosefs.com/v2/moosefs-csi-plugin/tags/list.
-        * `0.9.7-4.56.6-pro`   – plugin version 0.9.7 and MooseFS PRO 4.56.6
+        * `0.9.8-4.58.0-pro`   – plugin version 0.9.8 and MooseFS PRO 4.58.0
 
 
       **Note there are two occurrences of `csi-moosefs-plugin` in `csi-moosefs.yaml` file and it is necessary to update the image version in both places of the file.**

cmd/moosefs-csi-plugin/Dockerfile

@@ -13,18 +13,18 @@
 # limitations under the License.
 
 ARG CSI_TAG="v0.9.8"
-ARG MFS_TAG="v4.57.7"
+ARG MFS_TAG="v4.58.0"
 
 #Build MooseFS CSI driver from source
-FROM golang:1.23-bookworm AS csibuilder
+FROM golang:1.25-alpine3.22 AS csibuilder
 WORKDIR /build
 ARG CSI_TAG
+RUN apk add --update git
 RUN git clone --depth 1 --branch ${CSI_TAG} https://github.com/moosefs/moosefs-csi.git
 RUN cd moosefs-csi && CGO_ENABLED=0 GOCACHE=/tmp/go-cache GOOS=linux go build -a -o /build/moosefs-csi-plugin cmd/moosefs-csi-plugin/main.go
 
-#Build MooseFS Client from source Debian 12 Bookworm
 # MooseFS client is required for the CSI driver to mount volumes
-FROM ghcr.io/moosefs/mfsbuilder:latest AS mfsbuilder
+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
@@ -33,8 +33,8 @@ RUN ./configure --prefix=/usr --mandir=/share/man --sysconfdir=/etc --localstate
 RUN cd /moosefs/mfsclient && make DESTDIR=/tmp/ install
 
 #Build CSI plugin container
-FROM debian:bookworm
-RUN apt update && apt install -y libfuse3-3
+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"]

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.57.7
+          image: ghcr.io/moosefs/moosefs-csi:0.9.8-4.58.0
           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.57.7
+          image: ghcr.io/moosefs/moosefs-csi:0.9.8-4.58.0
           args:
             - "--mode=node"
             - "--csi-endpoint=$(CSI_ENDPOINT)"