cherry-pick juicefs for 0.8.3

api/v1alpha1/juicefsruntime_types.go

@@ -115,6 +115,11 @@ type JuiceFSCompTemplateSpec struct {
 	// PodMetadata defines labels and annotations that will be propagated to JuiceFs's pods.
 	// +optional
 	PodMetadata PodMetadata `json:"podMetadata,omitempty"`
+
+	// Whether to use hostnetwork or not
+	// +kubebuilder:validation:Enum=HostNetwork;"";ContainerNetwork
+	// +optional
+	NetworkMode NetworkMode `json:"networkMode,omitempty"`
 }
 
 type JuiceFSFuseSpec struct {
@@ -158,6 +163,11 @@ type JuiceFSFuseSpec struct {
 	// PodMetadata defines labels and annotations that will be propagated to JuiceFs's pods.
 	// +optional
 	PodMetadata PodMetadata `json:"podMetadata,omitempty"`
+
+	// Whether to use hostnetwork or not
+	// +kubebuilder:validation:Enum=HostNetwork;"";ContainerNetwork
+	// +optional
+	NetworkMode NetworkMode `json:"networkMode,omitempty"`
 }
 
 //+kubebuilder:object:root=true

charts/fluid-dataloader/juicefs/templates/dataloader.yaml

@@ -104,8 +104,6 @@ spec:
           envFrom:
             - configMapRef:
                 name: {{ required "targetDataset should be set" .Values.dataloader.targetDataset }}-juicefs-values
-          securityContext:
-            privileged: true
           volumeMounts:
             - mountPath: /scripts
               name: data-load-script

charts/fluid/fluid/crds/data.fluid.io_juicefsruntimes.yaml

@@ -209,6 +209,13 @@ spec:
                   imageTag:
                     description: Image for JuiceFS fuse
                     type: string
+                  networkMode:
+                    description: Whether to use hostnetwork or not
+                    enum:
+                    - HostNetwork
+                    - ""
+                    - ContainerNetwork
+                    type: string
                   nodeSelector:
                     additionalProperties:
                       type: string
@@ -467,6 +474,13 @@ spec:
                       - name
                       type: object
                     type: array
+                  networkMode:
+                    description: Whether to use hostnetwork or not
+                    enum:
+                    - HostNetwork
+                    - ""
+                    - ContainerNetwork
+                    type: string
                   nodeSelector:
                     additionalProperties:
                       type: string
@@ -735,6 +749,13 @@ spec:
                       - name
                       type: object
                     type: array
+                  networkMode:
+                    description: Whether to use hostnetwork or not
+                    enum:
+                    - HostNetwork
+                    - ""
+                    - ContainerNetwork
+                    type: string
                   nodeSelector:
                     additionalProperties:
                       type: string
@@ -4170,6 +4191,13 @@ spec:
                       - name
                       type: object
                     type: array
+                  networkMode:
+                    description: Whether to use hostnetwork or not
+                    enum:
+                    - HostNetwork
+                    - ""
+                    - ContainerNetwork
+                    type: string
                   nodeSelector:
                     additionalProperties:
                       type: string

charts/juicefs/CHANGELOG.md

@@ -29,3 +29,12 @@ Support configurable tieredstore's volume type
 0.2.6
 
 - Make fuse tolerate any taint
+
+0.2.7
+- Change podManagementPolicy from OrderedReady to Parallel
+
+0.2.8
+- Add volumes and volumeMounts to worker and fuse
+
+0.2.9
+- Add updateStrategy for fuse

charts/juicefs/Chart.yaml

@@ -1,7 +1,7 @@
 name: juicefs
 apiVersion: v1
 description: FileSystem aimed for data analytics and machine learning in any cloud.
-version: 0.2.6
+version: 0.2.9
 appVersion: v1.0.0
 home: https://juicefs.com/
 maintainers:

charts/juicefs/templates/fuse/daemonset.yaml

@@ -19,6 +19,8 @@ metadata:
       uid: {{ .Values.owner.uid }}
   {{- end }}
 spec:
+  updateStrategy:
+    type: {{ .Values.fuse.updateStrategy.type }}
   selector:
     matchLabels:
       app: {{ template "juicefs.name" . }}
@@ -49,7 +51,10 @@ spec:
       {{- if .Values.fuse.criticalPod }}
       priorityClassName: system-node-critical
       {{- end }}
-      dnsPolicy: {{ .Values.fuse.dnsPolicy }}
+      {{- if .Values.fuse.hostNetwork }}
+      hostNetwork: {{ .Values.fuse.hostNetwork }}
+      dnsPolicy: ClusterFirstWithHostNet
+      {{- end }}
       nodeSelector:
       {{- if .Values.fuse.nodeSelector }}
 {{ toYaml .Values.fuse.nodeSelector | trim | indent 8  }}
@@ -140,6 +145,9 @@ spec:
           - name: cache-dir-{{ $name }}
             mountPath: "{{ $mount.path }}"
           {{- end }}
+          {{- if .Values.fuse.volumeMounts }}
+{{ toYaml .Values.fuse.volumeMounts | indent 12 }}
+          {{- end }}
       restartPolicy: Always
       volumes:
         - name: juicefs-fuse-mount
@@ -162,6 +170,9 @@ spec:
           configMap:
             name: {{ template "juicefs.fullname" . }}-fuse-script
             defaultMode: 0755
+        {{- if .Values.fuse.volumes }}
+{{ toYaml .Values.fuse.volumes | indent 8 }}
+        {{- end }}
 ---
 apiVersion: v1
 kind: ConfigMap

charts/juicefs/templates/worker/statefuleset.yaml

@@ -1,3 +1,4 @@
+{{- $hostNetwork := .Values.worker.hostNetwork }}
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
@@ -22,6 +23,7 @@ metadata:
 spec:
   replicas: {{ .Values.worker.replicas }}
   serviceName: {{ template "juicefs.fullname" . }}-worker
+  podManagementPolicy: {{ .Values.worker.podManagementPolicy }}
   selector:
     matchLabels:
       app: {{ template "juicefs.name" . }}
@@ -51,6 +53,10 @@ spec:
         {{- end }}
         {{- end }}
     spec:
+      {{- if .Values.worker.hostNetwork }}
+      hostNetwork: {{ $hostNetwork }}
+      dnsPolicy: ClusterFirstWithHostNet
+      {{- end }}
       nodeSelector:
       {{- if .Values.worker.nodeSelector }}
 {{ toYaml .Values.worker.nodeSelector | trim | indent 8  }}
@@ -112,17 +118,6 @@ spec:
                 name: {{ .Values.configs.tokenSecret }}
                 key: token
           {{- end }}
-          livenessProbe:
-            exec:
-              command:
-                - sh
-                - -c
-                - 'if [ x$({{ .Values.worker.statCmd }}) = x1 ]; then exit 0; else exit 1; fi '
-            failureThreshold: 3
-            initialDelaySeconds: 1
-            periodSeconds: 1
-            successThreshold: 1
-            timeoutSeconds: 1
           lifecycle:
             preStop:
               exec:
@@ -134,6 +129,9 @@ spec:
             - name: cache-dir-{{ $name }}
               mountPath: "{{ $mount.path }}"
             {{- end }}
+            {{- if .Values.worker.volumeMounts }}
+{{ toYaml .Values.worker.volumeMounts | indent 12 }}
+            {{- end }}
       restartPolicy: Always
       volumes:
         {{- range $name, $mount := .Values.cacheDirs }}
@@ -152,6 +150,9 @@ spec:
           configMap:
             name: {{ template "juicefs.fullname" . }}-worker-script
             defaultMode: 0755
+        {{- if .Values.worker.volumes }}
+{{ toYaml .Values.worker.volumes | indent 8 }}
+        {{- end }}
 ---
 apiVersion: v1
 kind: ConfigMap

charts/juicefs/values.yaml

@@ -32,7 +32,6 @@ imagePullPolicy: IfNotPresent
 
 ## WORKER ##
 worker:
-  privileged: true
   image: ""
   imageTag: ""
   imagePullPolicy: ""
@@ -43,6 +42,8 @@ worker:
   command: ""
   mountPath: /mnt/jfs
   statCmd: "stat -c %i /mnt/jfs"
+  podManagementPolicy: Parallel
+  hostNetwork: false
   resources:
     requests:
 #      cpu: "0.5"
@@ -53,6 +54,8 @@ worker:
   replicas: 0
   labels: {}
   annotations: {}
+  volumes: []
+  volumeMounts: []
 
 configs:
   name: ""
@@ -67,7 +70,7 @@ configs:
 ## FUSE ##
 
 fuse:
-  privileged: true
+  hostNetwork: false
   subPath: ""
   criticalPod: false
   enabled: true
@@ -76,13 +79,14 @@ fuse:
   imagePullPolicy: IfNotPresent
   envs: []
   nodeSelector: {}
-  dnsPolicy: ClusterFirstWithHostNet
   # Mount path in the host
   mountPath: /mnt/jfs
   cacheDir: ""
   hostMountPath: /mnt/jfs
   command: "/usr/local/bin/juicefs mount /mnt/jfs"
   statCmd: "stat -c %i /mnt/jfs"
+  updateStrategy:
+    type: OnDelete
   resources:
     requests:
 #      cpu: "0.5"
@@ -92,6 +96,8 @@ fuse:
 #      memory: "4G"
   labels: {}
   annotations: {}
+  volumes: []
+  volumeMounts: []
 
 runtimeIdentity:
   namespace: default

config/crd/bases/data.fluid.io_juicefsruntimes.yaml

@@ -209,6 +209,13 @@ spec:
                   imageTag:
                     description: Image for JuiceFS fuse
                     type: string
+                  networkMode:
+                    description: Whether to use hostnetwork or not
+                    enum:
+                    - HostNetwork
+                    - ""
+                    - ContainerNetwork
+                    type: string
                   nodeSelector:
                     additionalProperties:
                       type: string
@@ -467,6 +474,13 @@ spec:
                       - name
                       type: object
                     type: array
+                  networkMode:
+                    description: Whether to use hostnetwork or not
+                    enum:
+                    - HostNetwork
+                    - ""
+                    - ContainerNetwork
+                    type: string
                   nodeSelector:
                     additionalProperties:
                       type: string
@@ -735,6 +749,13 @@ spec:
                       - name
                       type: object
                     type: array
+                  networkMode:
+                    description: Whether to use hostnetwork or not
+                    enum:
+                    - HostNetwork
+                    - ""
+                    - ContainerNetwork
+                    type: string
                   nodeSelector:
                     additionalProperties:
                       type: string
@@ -4170,6 +4191,13 @@ spec:
                       - name
                       type: object
                     type: array
+                  networkMode:
+                    description: Whether to use hostnetwork or not
+                    enum:
+                    - HostNetwork
+                    - ""
+                    - ContainerNetwork
+                    type: string
                   nodeSelector:
                     additionalProperties:
                       type: string