Merge branch 'master' into wangxu

fluid-cloudnative · Mar 2, 2022 · f9fe419 · f9fe419
2 parents 2f66caa + 2727bc7
commit f9fe419
Show file tree

Hide file tree

Showing 12 changed files with 452 additions and 397 deletions.
diff --git a/README.md b/README.md
@@ -15,6 +15,10 @@
 ## What is Fluid?
 Fluid is an open source Kubernetes-native Distributed Dataset Orchestrator and Accelerator for data-intensive applications, such as big data and AI applications. It is hosted by the [Cloud Native Computing Foundation](https://cncf.io) (CNCF) as a sandbox project.
 
+|<img src="https://user-images.githubusercontent.com/5708406/91202310-31eaab80-e734-11ea-84fc-c1b1882ae71c.png" height="24"/>&nbsp;Community Meeting|
+|------------------|
+| The Fluid project holds bi-weekly community online meeting. To join or watch previous meeting notes and recordings, please see [meeting schedule](https://github.com/fluid-cloudnative/community/wiki/Meeting-Schedule) and [meeting minutes](https://github.com/fluid-cloudnative/community/wiki/Meeting-Agenda-and-Notes). |
+
 # Fluid
 English | [简体中文](./README-zh_CN.md)
 

diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/charts/fluid-dataloader/jindo/templates/configmap.yaml b/charts/fluid-dataloader/jindo/templates/configmap.yaml
@@ -70,7 +70,7 @@ data:
         fi
 
         if [[ $enbaleCacheListLocation == 'false' ]]; then
-            cmd="$cmd -R -replica $replica $default$path"
+            cmd="$cmd -s -R -replica $replica $default$path"
             echo -e "execute cmd $cmd"
             time $cmd
         else
@@ -80,7 +80,7 @@ data:
             chmod 755 ossutil64
             ./ossutil64 -e $cacheListEndpoint -i $cacheListAccessKeyId -k $cacheListAccessKeySecret cp $cacheListUrl /cachelist.txt
             echo -e "--- enable File List"
-            cmd="$cmd -R -replica $cacheListReplica -cachelist /cachelist.txt -thread $cacheListThread $default/"
+            cmd="$cmd -s -R -replica $cacheListReplica -cachelist /cachelist.txt -thread $cacheListThread $default/"
             echo -e "execute cmd $cmd"
             time $cmd
         fi

diff --git a/charts/fluid/fluid/Chart.yaml b/charts/fluid/fluid/Chart.yaml
@@ -18,7 +18,7 @@ version: 0.7.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.7.0-394621b
+appVersion: 0.7.0-bec1c1a
 home: https://github.com/fluid-cloudnative/fluid
 keywords:
   - category:data

diff --git a/charts/fluid/fluid/values.yaml b/charts/fluid/fluid/values.yaml
@@ -6,7 +6,7 @@ workdir: /tmp
 
 dataset:
   controller:
-    image: fluidcloudnative/dataset-controller:v0.7.0-394621b
+    image: fluidcloudnative/dataset-controller:v0.7.0-bec1c1a
 
 csi:
   featureGates: "FuseRecovery=true"
@@ -15,7 +15,7 @@ csi:
   registrar:
     image: registry.aliyuncs.com/acs/csi-node-driver-registrar:v1.2.0
   plugins:
-    image: fluidcloudnative/fluid-csi:v0.7.0-394621b
+    image: fluidcloudnative/fluid-csi:v0.7.0-bec1c1a
   kubelet:
     rootDir: /var/lib/kubelet
 
@@ -28,9 +28,9 @@ runtime:
     portRange: 20000-26000
     enabled: true
     init:
-      image: fluidcloudnative/init-users:v0.7.0-394621b
+      image: fluidcloudnative/init-users:v0.7.0-bec1c1a
     controller:
-      image: fluidcloudnative/alluxioruntime-controller:v0.7.0-394621b
+      image: fluidcloudnative/alluxioruntime-controller:v0.7.0-bec1c1a
     runtime:
       image: registry.aliyuncs.com/alluxio/alluxio:release-2.7.2-SNAPSHOT-3714f2b
     fuse:
@@ -44,32 +44,32 @@ runtime:
     fuse:
       image: registry.cn-shanghai.aliyuncs.com/jindofs/jindo-fuse:3.8.0
     controller:
-      image: fluidcloudnative/jindoruntime-controller:v0.7.0-394621b
+      image: fluidcloudnative/jindoruntime-controller:v0.7.0-bec1c1a
     init:
       portCheck:
         enabled: false
-      image: fluidcloudnative/init-users:v0.7.0-394621b
+      image: fluidcloudnative/init-users:v0.7.0-bec1c1a
   goosefs:
     runtimeWorkers: 3
     portRange: 26000-32000
     enabled: false
     init:
-      image: fluidcloudnative/init-users:v0.7.0-394621b
+      image: fluidcloudnative/init-users:v0.7.0-bec1c1a
     controller:
-      image: fluidcloudnative/goosefsruntime-controller:v0.7.0-394621b
+      image: fluidcloudnative/goosefsruntime-controller:v0.7.0-bec1c1a
     runtime:
       image: ccr.ccs.tencentyun.com/qcloud/goosefs:v1.2.0
     fuse:
       image: ccr.ccs.tencentyun.com/qcloud/goosefs-fuse:v1.2.0
   juicefs:
     enabled: false
     controller:
-      image: fluidcloudnative/juicefsruntime-controller:v0.7.0-394621b
+      image: fluidcloudnative/juicefsruntime-controller:v0.7.0-bec1c1a
     fuse:
       image: juicedata/juicefs-csi-driver:v0.11.0
 
 webhook:
   enabled: true
-  image: fluidcloudnative/fluid-webhook:v0.7.0-394621b
+  image: fluidcloudnative/fluid-webhook:v0.7.0-bec1c1a
   replicas: 1