Support toleration and fix exclusive label deletion issue (fluid-clou…

…dnative#578) * Add Toleration to dataset spec Signed-off-by: cheyang <[email protected]> * add toleration to dataset * Add Toleration to dataset spec Signed-off-by: cheyang <[email protected]> * Add Toleration to dataset spec Signed-off-by: cheyang <[email protected]> * Add Toleration to dataset spec Signed-off-by: cheyang <[email protected]> * Fix exclusiveKey failed to delete issue Signed-off-by: cheyang <[email protected]> * Fix docs Signed-off-by: cheyang <[email protected]> * Fix exclusiveKey failed to delete issue Signed-off-by: cheyang <[email protected]> * update crd * Fix exclusiveKey failed to delete issue Signed-off-by: cheyang <[email protected]> * Fix exclusiveKey failed to delete issue Signed-off-by: cheyang <[email protected]> * Fix exclusiveKey failed to delete issue Signed-off-by: cheyang <[email protected]> * Check master status before cleaning up cache Signed-off-by: cheyang <[email protected]> * Check master status before cleaning up cache Signed-off-by: cheyang <[email protected]> * Check master status before cleaning up cache Signed-off-by: cheyang <[email protected]> * Check master status before cleaning up cache Signed-off-by: cheyang <[email protected]> * Check master status before cleaning up cache Signed-off-by: cheyang <[email protected]> * Check master status before cleaning up cache Signed-off-by: cheyang <[email protected]>
zhang-x-z · Feb 9, 2021 · a56e352 · a56e352
1 parent ecceb63
commit a56e352
Show file tree

Hide file tree

Showing 25 changed files with 443 additions and 42 deletions.
diff --git a/api/v1alpha1/dataset_types.go b/api/v1alpha1/dataset_types.go
@@ -117,6 +117,10 @@ type DatasetSpec struct {
 	// +optional
 	NodeAffinity *CacheableNodeAffinity `json:"nodeAffinity,omitempty"`
 
+	// If specified, the pod's tolerations.
+	// +optional
+	Tolerations []v1.Toleration `json:"tolerations,omitempty"`
+
 	// AccessModes contains all ways the volume backing the PVC can be mounted
 	// +optional
 	AccessModes []v1.PersistentVolumeAccessMode `json:"accessModes,omitempty"`

diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/charts/alluxio/CHANGELOG.md b/charts/alluxio/CHANGELOG.md
@@ -169,3 +169,10 @@
 - Make the port configurable
 - Make the cache worker directory configurable
 
+
+0.6.18
+
+- support HDFS configuration file
+- suppport metadata backup
+- support tolerations
+
diff --git a/charts/alluxio/templates/fuse/daemonset.yaml b/charts/alluxio/templates/fuse/daemonset.yaml
@@ -48,6 +48,10 @@ spec:
 {{ toYaml .Values.fuse.nodeSelector | trim | indent 8  }}
       {{- else if .Values.nodeSelector }}
 {{ toYaml .Values.nodeSelector | trim | indent 8  }}
+      {{- end }}
+      {{- if .Values.tolerations }}
+      tolerations:
+{{ toYaml .Values.tolerations | indent 8 }}
       {{- end }}
       securityContext:
         fsGroup: {{ .Values.fuse.fsGroup }}

diff --git a/charts/alluxio/templates/master/statefulset.yaml b/charts/alluxio/templates/master/statefulset.yaml
@@ -61,6 +61,10 @@ spec:
       {{- end }}
       securityContext:
         fsGroup: {{ .Values.fsGroup }}
+      {{- if .Values.tolerations }}
+      tolerations:
+{{ toYaml .Values.tolerations | indent 8 }}
+      {{- end }}
       affinity:
       {{- if .Values.master.affinity }}
 {{ toYaml .Values.master.affinity | indent 8  }}

diff --git a/charts/alluxio/templates/worker/daemonset.yaml b/charts/alluxio/templates/worker/daemonset.yaml
@@ -49,6 +49,10 @@ spec:
 {{ toYaml .Values.worker.nodeSelector | trim | indent 8  }}
       {{- else if .Values.nodeSelector }}
 {{ toYaml .Values.nodeSelector | trim | indent 8  }}
+      {{- end }}
+      {{- if .Values.tolerations }}
+      tolerations:
+{{ toYaml .Values.tolerations | indent 8 }}
       {{- end }}
       initContainers:
         {{ if .Values.initUsers.enabled -}}

diff --git a/charts/alluxio/values.yaml b/charts/alluxio/values.yaml
@@ -57,6 +57,17 @@ properties:
 # Use labels to run Alluxio on a subset of the K8s nodes
 # nodeSelector: {}
 
+##
+## Example:
+##   - key: "toleration=key"
+##     operator: "Equal"
+##     value: "value"
+##     effect: "NoSchedule"
+##
+## Ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
+##
+tolerations: []
+
 ## Master ##
 
 master:

diff --git a/charts/fluid/fluid/crds/data.fluid.io_databackups.yaml b/charts/fluid/fluid/crds/data.fluid.io_databackups.yaml
@@ -72,7 +72,7 @@ spec:
                     in the form of local://subpath
                   type: string
                 path:
-                  description: Path describes the path of backup, in the form of local://subpath
+                  description: Path describes the path of backup, in the form of local:///absolutePath
                     or pvc://<pvcName>/subpath
                   type: string
               type: object

diff --git a/charts/fluid/fluid/crds/data.fluid.io_datasets.yaml b/charts/fluid/fluid/crds/data.fluid.io_datasets.yaml
@@ -272,6 +272,46 @@ spec:
                     type: string
                 type: object
               type: array
+            tolerations:
+              description: If specified, the pod's tolerations.
+              items:
+                description: The pod this Toleration is attached to tolerates any
+                  taint that matches the triple <key,value,effect> using the matching
+                  operator <operator>.
+                properties:
+                  effect:
+                    description: Effect indicates the taint effect to match. Empty
+                      means match all taint effects. When specified, allowed values
+                      are NoSchedule, PreferNoSchedule and NoExecute.
+                    type: string
+                  key:
+                    description: Key is the taint key that the toleration applies
+                      to. Empty means match all taint keys. If the key is empty, operator
+                      must be Exists; this combination means to match all values and
+                      all keys.
+                    type: string
+                  operator:
+                    description: Operator represents a key's relationship to the value.
+                      Valid operators are Exists and Equal. Defaults to Equal. Exists
+                      is equivalent to wildcard for value, so that a pod can tolerate
+                      all taints of a particular category.
+                    type: string
+                  tolerationSeconds:
+                    description: TolerationSeconds represents the period of time the
+                      toleration (which must be of effect NoExecute, otherwise this
+                      field is ignored) tolerates the taint. By default, it is not
+                      set, which means tolerate the taint forever (do not evict).
+                      Zero and negative values will be treated as 0 (evict immediately)
+                      by the system.
+                    format: int64
+                    type: integer
+                  value:
+                    description: Value is the taint value the toleration matches to.
+                      If the operator is Exists, the value should be empty, otherwise
+                      just a regular string.
+                    type: string
+                type: object
+              type: array
           type: object
         status:
           description: DatasetStatus defines the observed state of Dataset

diff --git a/charts/fluid/fluid/values.yaml b/charts/fluid/fluid/values.yaml
@@ -6,13 +6,13 @@ workdir: /tmp
 
 dataset:
   controller:
-    image: registry.cn-hangzhou.aliyuncs.com/fluid/dataset-controller:v0.5.0-4be7c32
+    image: registry.cn-hangzhou.aliyuncs.com/fluid/dataset-controller:v0.5.0-b232d49
 
 csi:
   registrar:
     image: registry.cn-hangzhou.aliyuncs.com/acs/csi-node-driver-registrar:v1.2.0
   plugins:
-    image: registry.cn-hangzhou.aliyuncs.com/fluid/fluid-csi:v0.5.0-4be7c32
+    image: registry.cn-hangzhou.aliyuncs.com/fluid/fluid-csi:v0.5.0-b232d49
   kubelet:
     rootDir: /var/lib/kubelet
 
@@ -21,14 +21,14 @@ runtime:
   alluxio:
     enabled: true
     init:
-      image: registry.cn-hangzhou.aliyuncs.com/fluid/init-users:v0.5.0-4be7c32
+      image: registry.cn-hangzhou.aliyuncs.com/fluid/init-users:v0.5.0-b232d49
     controller:
-      image: registry.cn-hangzhou.aliyuncs.com/fluid/alluxioruntime-controller:v0.5.0-4be7c32
+      image: registry.cn-hangzhou.aliyuncs.com/fluid/alluxioruntime-controller:v0.5.0-b232d49
     runtime:
       image: registry.cn-huhehaote.aliyuncs.com/alluxio/alluxio:2.4.1-2-SNAPSHOT-f4676d3
     fuse:
       image: registry.cn-huhehaote.aliyuncs.com/alluxio/alluxio-fuse:2.4.1-2-SNAPSHOT-f4676d3
   jindo:
     enabled: false
     controller:
-      image: registry.cn-hangzhou.aliyuncs.com/fluid/jindoruntime-controller:v0.5.0-4be7c32
+      image: registry.cn-hangzhou.aliyuncs.com/fluid/jindoruntime-controller:v0.5.0-b232d49
diff --git a/config/crd/bases/data.fluid.io_databackups.yaml b/config/crd/bases/data.fluid.io_databackups.yaml
@@ -72,7 +72,7 @@ spec:
                     in the form of local://subpath
                   type: string
                 path:
-                  description: Path describes the path of backup, in the form of local://subpath
+                  description: Path describes the path of backup, in the form of local:///absolutePath
                     or pvc://<pvcName>/subpath
                   type: string
               type: object

diff --git a/config/crd/bases/data.fluid.io_datasets.yaml b/config/crd/bases/data.fluid.io_datasets.yaml
@@ -272,6 +272,46 @@ spec:
                     type: string
                 type: object
               type: array
+            tolerations:
+              description: If specified, the pod's tolerations.
+              items:
+                description: The pod this Toleration is attached to tolerates any
+                  taint that matches the triple <key,value,effect> using the matching
+                  operator <operator>.
+                properties:
+                  effect:
+                    description: Effect indicates the taint effect to match. Empty
+                      means match all taint effects. When specified, allowed values
+                      are NoSchedule, PreferNoSchedule and NoExecute.
+                    type: string
+                  key:
+                    description: Key is the taint key that the toleration applies
+                      to. Empty means match all taint keys. If the key is empty, operator
+                      must be Exists; this combination means to match all values and
+                      all keys.
+                    type: string
+                  operator:
+                    description: Operator represents a key's relationship to the value.
+                      Valid operators are Exists and Equal. Defaults to Equal. Exists
+                      is equivalent to wildcard for value, so that a pod can tolerate
+                      all taints of a particular category.
+                    type: string
+                  tolerationSeconds:
+                    description: TolerationSeconds represents the period of time the
+                      toleration (which must be of effect NoExecute, otherwise this
+                      field is ignored) tolerates the taint. By default, it is not
+                      set, which means tolerate the taint forever (do not evict).
+                      Zero and negative values will be treated as 0 (evict immediately)
+                      by the system.
+                    format: int64
+                    type: integer
+                  value:
+                    description: Value is the taint value the toleration matches to.
+                      If the operator is Exists, the value should be empty, otherwise
+                      just a regular string.
+                    type: string
+                type: object
+              type: array
           type: object
         status:
           description: DatasetStatus defines the observed state of Dataset

diff --git a/docs/zh/TOC.md b/docs/zh/TOC.md
@@ -15,6 +15,7 @@
   - [数据加速（通过HDFS接口访问）](samples/accelerate_data_accessing_by_hdfs.md)
   - [使用参数加密](samples/use_encryptoptions.md)
   - [缓存亲和性调度](samples/data_co_locality.md)
+  - [缓存容忍污点调度](samples/data_toleration.md)
   - [机器学习](samples/machinelearning.md)
   - [主机目录加速](samples/hostpath.md)
   - [数据卷加速](samples/accelerate_pvc.md)