release 0.22.1 (#747)

Signed-off-by: zwwhdls <[email protected]>
juicedata · Sep 11, 2023 · 86eab3a · 86eab3a
1 parent ecddc72
commit 86eab3a
Show file tree

Hide file tree

Showing 9 changed files with 45 additions and 32 deletions.
diff --git a/.github/workflows/csi-slim.yaml b/.github/workflows/csi-slim.yaml
@@ -2,6 +2,11 @@ name: build csi slim image
 
 on:
   workflow_dispatch:
+    inputs:
+      ce_juicefs_build_version:
+        description: 'ce juicefs version for image build'
+        required: false
+        type: string
   release:
     types:
       - created
@@ -15,9 +20,24 @@ jobs:
         env:
           PASSWORD: ${{ secrets.DOCKERHUB_FUSE_ACCESS_TOKEN }}
         run: docker login --username chnliyong --password ${PASSWORD}
+      - name: Confirm juicefs version
+        env:
+          JUICEFS_BUILD_VERSION: ${{ inputs.ce_juicefs_build_version }}
+        run: |
+          if [ ${{ env.JUICEFS_BUILD_VERSION }} ]; then
+            echo "JUICEFS_CE_LATEST_VERSION=${{ env.JUICEFS_BUILD_VERSION }}" >> $GITHUB_ENV
+          else
+            JUICEFS_CE_LATEST_VERSION=$(curl -fsSL https://api.github.com/repos/juicedata/juicefs/releases/latest | grep tag_name | grep -oE 'v[0-9]+\.[0-9][0-9]*(\.[0-9]+(-[0-9a-z]+)?)?')
+            echo "JUICEFS_CE_LATEST_VERSION=$JUICEFS_CE_LATEST_VERSION" >> $GITHUB_ENV
+          JUICEFS_EE_LATEST_VERSION=$(curl -sSL https://juicefs.com/static/juicefs -o juicefs-ee && chmod +x juicefs-ee && ./juicefs-ee version | cut -d' ' -f3)
+          echo "JUICEFS_EE_LATEST_VERSION=$JUICEFS_EE_LATEST_VERSION" >> $GITHUB_ENV
       - name: Buildx and Push csi slim image
+        env:
+          CEVERSION: ce-${{ env.JUICEFS_CE_LATEST_VERSION }}
+          CEJUICEFS_VERSION: ${{ env.JUICEFS_CE_LATEST_VERSION }}
+          EEVERSION: ee-${{ env.JUICEFS_EE_LATEST_VERSION }}
         run: |
           export DOCKER_CLI_EXPERIMENTAL=enabled
           docker run --rm --privileged docker/binfmt:66f9012c56a8316f9244ffd7622d7c21c1f6f28d
           docker buildx create --use --name mybuilder
-          make csi-slim-image-version
+          make -C docker csi-slim-image-version
diff --git a/.github/workflows/version.yaml b/.github/workflows/version.yaml
@@ -1,29 +1,17 @@
 name: version
 
 on:
+  workflow_dispatch:
+    inputs:
+      ce_juicefs_build_version:
+        description: 'ce juicefs version for image build'
+        required: false
+        type: string
   release:
     types:
       - created
 
 jobs:
-  test:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Set up Go 1.18.x
-        uses: actions/setup-go@v2
-        with:
-          go-version: '1.18.x'
-      - name: Check out code into the Go module directory
-        uses: actions/checkout@v2
-      - name: Build
-        run: make
-      - name: Verify
-        run: make verify
-      - name: Test
-        run: make test
-      - name: Test sanity
-        run: make test-sanity
-
   publish-version:
     needs: test
     runs-on: ubuntu-latest
@@ -34,9 +22,14 @@ jobs:
       env:
         PASSWORD: ${{ secrets.DOCKERHUB_FUSE_ACCESS_TOKEN }}
     - name: Confirm juicefs version
+      env:
+        JUICEFS_BUILD_VERSION: ${{ inputs.ce_juicefs_build_version }}
       run: |
-        JUICEFS_CE_LATEST_VERSION=$(curl -fsSL https://api.github.com/repos/juicedata/juicefs/releases/latest | grep tag_name | grep -oE 'v[0-9]+\.[0-9][0-9]*(\.[0-9]+(-[0-9a-z]+)?)?')
-        echo "JUICEFS_CE_LATEST_VERSION=$JUICEFS_CE_LATEST_VERSION" >> $GITHUB_ENV
+        if [ ${{ env.JUICEFS_BUILD_VERSION }} ]; then
+          echo "JUICEFS_CE_LATEST_VERSION=${{ env.JUICEFS_BUILD_VERSION }}" >> $GITHUB_ENV
+        else
+          JUICEFS_CE_LATEST_VERSION=$(curl -fsSL https://api.github.com/repos/juicedata/juicefs/releases/latest | grep tag_name | grep -oE 'v[0-9]+\.[0-9][0-9]*(\.[0-9]+(-[0-9a-z]+)?)?')
+          echo "JUICEFS_CE_LATEST_VERSION=$JUICEFS_CE_LATEST_VERSION" >> $GITHUB_ENV
         JUICEFS_EE_LATEST_VERSION=$(curl -sSL https://juicefs.com/static/juicefs -o juicefs-ee && chmod +x juicefs-ee && ./juicefs-ee version | cut -d' ' -f3)
         echo "JUICEFS_EE_LATEST_VERSION=$JUICEFS_EE_LATEST_VERSION" >> $GITHUB_ENV
     - name: Build docker image & push

diff --git a/deploy/k8s.yaml b/deploy/k8s.yaml
@@ -308,7 +308,7 @@ spec:
           value: /var/lib/juicefs/volume
         - name: JUICEFS_CONFIG_PATH
           value: /var/lib/juicefs/config
-        image: juicedata/juicefs-csi-driver:v0.22.0
+        image: juicedata/juicefs-csi-driver:v0.22.1
         livenessProbe:
           failureThreshold: 5
           httpGet:
@@ -456,7 +456,7 @@ spec:
           value: /var/lib/juicefs/volume
         - name: JUICEFS_CONFIG_PATH
           value: /var/lib/juicefs/config
-        image: juicedata/juicefs-csi-driver:v0.22.0
+        image: juicedata/juicefs-csi-driver:v0.22.1
         lifecycle:
           preStop:
             exec:

diff --git a/deploy/k8s_before_v1_18.yaml b/deploy/k8s_before_v1_18.yaml
@@ -308,7 +308,7 @@ spec:
           value: /var/lib/juicefs/volume
         - name: JUICEFS_CONFIG_PATH
           value: /var/lib/juicefs/config
-        image: juicedata/juicefs-csi-driver:v0.22.0
+        image: juicedata/juicefs-csi-driver:v0.22.1
         livenessProbe:
           failureThreshold: 5
           httpGet:
@@ -456,7 +456,7 @@ spec:
           value: /var/lib/juicefs/volume
         - name: JUICEFS_CONFIG_PATH
           value: /var/lib/juicefs/config
-        image: juicedata/juicefs-csi-driver:v0.22.0
+        image: juicedata/juicefs-csi-driver:v0.22.1
         lifecycle:
           preStop:
             exec:

diff --git a/deploy/kubernetes/base/resources.yaml b/deploy/kubernetes/base/resources.yaml
@@ -228,7 +228,7 @@ spec:
           operator: Exists
       containers:
         - name: juicefs-plugin
-          image: juicedata/juicefs-csi-driver:v0.22.0
+          image: juicedata/juicefs-csi-driver:v0.22.1
           args:
             - --endpoint=$(CSI_ENDPOINT)
             - --logtostderr
@@ -365,7 +365,7 @@ spec:
         - name: juicefs-plugin
           securityContext:
             privileged: true
-          image: juicedata/juicefs-csi-driver:v0.22.0
+          image: juicedata/juicefs-csi-driver:v0.22.1
           args:
             - --endpoint=$(CSI_ENDPOINT)
             - --logtostderr

diff --git a/deploy/webhook-with-certmanager.yaml b/deploy/webhook-with-certmanager.yaml
@@ -247,7 +247,7 @@ spec:
           value: /var/lib/juicefs/volume
         - name: JUICEFS_CONFIG_PATH
           value: /var/lib/juicefs/config
-        image: juicedata/juicefs-csi-driver:v0.22.0
+        image: juicedata/juicefs-csi-driver:v0.22.1
         livenessProbe:
           failureThreshold: 5
           httpGet:

diff --git a/deploy/webhook.yaml b/deploy/webhook.yaml
@@ -275,7 +275,7 @@ spec:
           value: /var/lib/juicefs/volume
         - name: JUICEFS_CONFIG_PATH
           value: /var/lib/juicefs/config
-        image: juicedata/juicefs-csi-driver:v0.22.0
+        image: juicedata/juicefs-csi-driver:v0.22.1
         livenessProbe:
           failureThreshold: 5
           httpGet:

diff --git a/docker/Makefile b/docker/Makefile
@@ -97,7 +97,7 @@ image-release-check-push:
 .PHONY: csi-slim-image-version
 csi-slim-image-version:
 	docker buildx build -f csi.Dockerfile -t $(REGISTRY)/$(IMAGE):$(VERSION)-slim \
-        --build-arg JUICEFS_REPO_REF=$(JUICEFS_CE_LATEST_VERSION) \
+        --build-arg JUICEFS_REPO_REF=$(CE_JUICEFS_VERSION) \
 		--build-arg JUICEFS_CE_MOUNT_IMAGE=$(JUICEFS_IMAGE):$(CE_VERSION) \
 		--build-arg JUICEFS_EE_MOUNT_IMAGE=$(JUICEFS_IMAGE):$(EE_VERSION) \
 		--platform linux/amd64,linux/arm64 . --push

diff --git a/scripts/juicefs-csi-webhook-install.sh b/scripts/juicefs-csi-webhook-install.sh
@@ -346,7 +346,7 @@ spec:
           value: /var/lib/juicefs/volume
         - name: JUICEFS_CONFIG_PATH
           value: /var/lib/juicefs/config
-        image: juicedata/juicefs-csi-driver:v0.22.0
+        image: juicedata/juicefs-csi-driver:v0.22.1
         livenessProbe:
           failureThreshold: 5
           httpGet:
@@ -748,7 +748,7 @@ spec:
           value: /var/lib/juicefs/volume
         - name: JUICEFS_CONFIG_PATH
           value: /var/lib/juicefs/config
-        image: juicedata/juicefs-csi-driver:v0.22.0
+        image: juicedata/juicefs-csi-driver:v0.22.1
         livenessProbe:
           failureThreshold: 5
           httpGet: