Support libfuse3 for alluxio 2.9, To #48332603 (fluid-cloudnative#3236)

Signed-off-by: cheyang <cheyang@163.com>
Isla-top · May 17, 2023 · fab0b3f · fab0b3f
1 parent 66d64fd
commit fab0b3f
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 18 deletions.
diff --git a/Makefile b/Makefile
@@ -82,7 +82,8 @@ DOCKER_PUSH += docker-push-goosefsruntime-controller
 DOCKER_PUSH += docker-push-juicefsruntime-controller
 DOCKER_PUSH += docker-push-thinruntime-controller
 DOCKER_PUSH += docker-push-efcruntime-controller
-DOCKER_PUSH += docker-push-init-users
+# Not need to push init-users image by default
+# DOCKER_PUSH += docker-push-init-users
 DOCKER_PUSH += docker-push-crd-upgrader
 
 # Buildx and push docker images
@@ -227,7 +228,7 @@ docker-build-loader:
 	docker build --no-cache charts/fluid-dataloader/docker/loader -t ${LOADER_IMG}
 
 docker-build-init-users:
-	docker build --no-cache charts/alluxio/docker/init-users -t ${INIT_USERS_IMG}:${GIT_VERSION}
+	docker build --no-cache charts/alluxio/docker/init-users -t ${INIT_USERS_IMG}:${VERSION}
 
 docker-build-webhook:
 	docker build --no-cache --build-arg TARGETARCH=${ARCH} . -f docker/Dockerfile.webhook -t ${WEBHOOK_IMG}:${GIT_VERSION}
@@ -267,7 +268,7 @@ docker-push-loader: docker-build-loader
 	docker push ${LOADER_IMG}
 
 docker-push-init-users: docker-build-init-users
-	docker push ${INIT_USERS_IMG}:${GIT_VERSION}
+	docker push ${INIT_USERS_IMG}:${VERSION}
 
 docker-push-webhook: docker-build-webhook
 	docker push ${WEBHOOK_IMG}:${GIT_VERSION}
@@ -304,7 +305,7 @@ docker-buildx-push-csi: generate fmt vet
 	docker buildx build --push --platform linux/amd64,linux/arm64 --no-cache . -f docker/Dockerfile.csi -t ${CSI_IMG}:${GIT_VERSION}
 
 docker-buildx-push-init-users:
-	docker buildx build --push --platform linux/amd64,linux/arm64 --no-cache charts/alluxio/docker/init-users -t ${INIT_USERS_IMG}:${GIT_VERSION}
+	docker buildx build --push --platform linux/amd64,linux/arm64 --no-cache charts/alluxio/docker/init-users -t ${INIT_USERS_IMG}:${VERSION}
 
 docker-buildx-push-webhook:
 	docker buildx build --push --platform linux/amd64,linux/arm64 --no-cache . -f docker/Dockerfile.webhook -t ${WEBHOOK_IMG}:${GIT_VERSION}

diff --git a/charts/fluid/fluid/Chart.yaml b/charts/fluid/fluid/Chart.yaml
@@ -18,7 +18,7 @@ version: 0.9.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application.
-appVersion: 0.9.0-d751eb1
+appVersion: 0.9.0-66d64fd
 home: https://github.com/fluid-cloudnative/fluid
 keywords:
   - category:data

diff --git a/charts/fluid/fluid/values.yaml b/charts/fluid/fluid/values.yaml
@@ -4,7 +4,7 @@
 
 workdir: /tmp
 crdUpgrade:
-  image: fluidcloudnative/fluid-crd-upgrader:v0.9.0-d751eb1
+  image: fluidcloudnative/fluid-crd-upgrader:v0.9.0-66d64fd
 
 ##  if unspecified, will use built-in variable `.Release.Namespace`.
 namespace: fluid-system
@@ -15,7 +15,7 @@ image:
 dataset:
   replicas: 1
   controller:
-    image: fluidcloudnative/dataset-controller:v0.9.0-d751eb1
+    image: fluidcloudnative/dataset-controller:v0.9.0-66d64fd
 
 csi:
   featureGates: "FuseRecovery=false"
@@ -24,7 +24,7 @@ csi:
   registrar:
     image: fluidcloudnative/csi-node-driver-registrar:v2.3.0
   plugins:
-    image: fluidcloudnative/fluid-csi:v0.9.0-d751eb1
+    image: fluidcloudnative/fluid-csi:v0.9.0-66d64fd
   kubelet:
     kubeConfigFile: /etc/kubernetes/kubelet.conf
     certDir: /var/lib/kubelet/pki
@@ -44,7 +44,7 @@ runtime:
     init:
       image: fluidcloudnative/init-users:v0.9.0
     controller:
-      image: fluidcloudnative/alluxioruntime-controller:v0.9.0-d751eb1
+      image: fluidcloudnative/alluxioruntime-controller:v0.9.0-66d64fd
     runtime:
       image: alluxio/alluxio-dev:2.9.0
     fuse:
@@ -62,21 +62,21 @@ runtime:
     fuse:
       image: registry.cn-shanghai.aliyuncs.com/jindofs/jindo-fuse:4.6.7
     controller:
-      image: fluidcloudnative/jindoruntime-controller:v0.9.0-d751eb1
+      image: fluidcloudnative/jindoruntime-controller:v0.9.0-66d64fd
     init:
       portCheck:
         enabled: false
-      image: fluidcloudnative/init-users:v0.9.0-d751eb1
+      image: fluidcloudnative/init-users:v0.9.0
   goosefs:
     replicas: 1
     runtimeWorkers: 3
     portRange: 26000-32000
     portAllocatePolicy: random
     enabled: false
     init:
-      image: fluidcloudnative/init-users:v0.9.0-d751eb1
+      image: fluidcloudnative/init-users:v0.9.0
     controller:
-      image: fluidcloudnative/goosefsruntime-controller:v0.9.0-d751eb1
+      image: fluidcloudnative/goosefsruntime-controller:v0.9.0-66d64fd
     runtime:
       image: ccr.ccs.tencentyun.com/qcloud/goosefs:v1.2.0
     fuse:
@@ -86,19 +86,19 @@ runtime:
     enabled: false
     runtimeWorkers: 3
     controller:
-      image: fluidcloudnative/juicefsruntime-controller:v0.9.0-d751eb1
+      image: fluidcloudnative/juicefsruntime-controller:v0.9.0-66d64fd
     fuse:
       image: juicedata/juicefs-fuse:v1.0.4-4.9.2
   thin:
     replicas: 1
     enabled: false
     controller:
-      image: fluidcloudnative/thinruntime-controller:v0.9.0-d751eb1
+      image: fluidcloudnative/thinruntime-controller:v0.9.0-66d64fd
   efc:
     replicas: 1
     enabled: false
     controller:
-      image: fluidcloudnative/efcruntime-controller:v0.9.0-d751eb1
+      image: fluidcloudnative/efcruntime-controller:v0.9.0-66d64fd
       imagePullPolicy: Always
     init:
       image: registry.cn-zhangjiakou.aliyuncs.com/nascache/init-alifuse:v1.2.2-19dcee9
@@ -111,7 +111,7 @@ runtime:
 
 webhook:
   enabled: true
-  image: fluidcloudnative/fluid-webhook:v0.9.0-d751eb1
+  image: fluidcloudnative/fluid-webhook:v0.9.0-66d64fd
   replicas: 1
   timeoutSeconds: 15
   reinvocationPolicy: IfNeeded
@@ -120,4 +120,4 @@ fluidapp:
   enabled: true
   replicas: 1
   controller:
-    image: fluidcloudnative/application-controller:v0.9.0-d751eb1
+    image: fluidcloudnative/application-controller:v0.9.0-66d64fd