Feat/dataload support affinity (#2649)

* support image pull secrets for databackup Signed-off-by: mahao <allenhaozi@gmail.com> * dataload support affinity,nodeSelector,tolerations,schedulerName Signed-off-by: mahao <allenhaozi@gmail.com>
fluid-cloudnative · Mar 5, 2023 · 00424f2 · 00424f2
1 parent 1c4b690
commit 00424f2
Show file tree

Hide file tree

Showing 16 changed files with 2,290 additions and 40 deletions.
diff --git a/api/v1alpha1/dataload_types.go b/api/v1alpha1/dataload_types.go
@@ -16,6 +16,7 @@ limitations under the License.
 package v1alpha1
 
 import (
+	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
@@ -58,6 +59,20 @@ type DataLoadSpec struct {
 
 	// PodMetadata defines labels and annotations that will be propagated to DataLoad pods
 	PodMetadata PodMetadata `json:"podMetadata,omitempty"`
+
+	// +optional
+	// pod
+	Affinity *corev1.Affinity `json:"affinity,omitempty"`
+
+	// +optional
+	Tolerations []corev1.Toleration `json:"tolerations,omitempty"`
+
+	// +optional
+	// pod node selector
+	NodeSelector map[string]string `json:"nodeSelector,omitempty"`
+
+	// +optional
+	SchedulerName string `json:"schedulerName,omitempty"`
 }
 
 // +kubebuilder:printcolumn:name="Dataset",type="string",JSONPath=`.spec.dataset.name`

diff --git a/api/v1alpha1/openapi_generated.go b/api/v1alpha1/openapi_generated.go
diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/charts/fluid-dataloader/alluxio/CHANGELOG.md b/charts/fluid-dataloader/alluxio/CHANGELOG.md
@@ -10,3 +10,6 @@
 ### 0.3.0
 
 - Support configurable DataLoad pod metadata
+
+### 0.9.0
+- Dataload support Affinity,Tolerations,NodeSelector,SchedulerName
diff --git a/charts/fluid-dataloader/alluxio/templates/dataloader.yaml b/charts/fluid-dataloader/alluxio/templates/dataloader.yaml
@@ -44,6 +44,21 @@ spec:
       {{- end }}
       {{- end }}
     spec:
+      {{- if .Values.dataloader.schedulerName }}
+      schedulerName: {{ .Values.dataloader.schedulerName }}
+      {{- end }}
+      {{- with .Values.dataloader.nodeSelector }}
+      nodeSelector: 
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.dataloader.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.dataloader.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       restartPolicy: Never
       {{- with .Values.dataloader.imagePullSecrets }}
       imagePullSecrets:

diff --git a/charts/fluid-dataloader/alluxio/values.yaml b/charts/fluid-dataloader/alluxio/values.yaml
@@ -10,7 +10,8 @@ dataloader:
 
   # Required
   # Description: the dataset that this DataLoad targets
-  targetDataset: #imagenet
+  #targetDataset: imagenet
+  targetDataset: ""
 
   # Optional
   # Default: false
@@ -27,7 +28,8 @@ dataloader:
 
   # Required
   # Description: the image that the DataLoad job uses
-  image: #<alluxio-image>
+  #image: <alluxio-image>
+  image: ""
 
   # Optional
   # Description: optional labels on DataLoad pods
@@ -40,3 +42,44 @@ dataloader:
   # Optional
   # Description: optional image pull secrets on DataLoad pods
   imagePullSecrets: []
+
+  # Optional
+  # Description: optional pod affinity
+  #  affinity:
+  #    nodeAffinity:
+  #      requiredDuringSchedulingIgnoredDuringExecution:
+  #        nodeSelectorTerms:
+  #          - matchExpressions:
+  #              - key: topology.kubernetes.io/zone
+  #                operator: In
+  #                values:
+  #                  - antarctica-east1
+  #                  - antarctica-west1
+  #      preferredDuringSchedulingIgnoredDuringExecution:
+  #        - weight: 1
+  #          preference:
+  #            matchExpressions:
+  #              - key: another-node-label-key
+  #                operator: In
+  #                values:
+  #                  - another-node-label-value
+  affinity: {}
+
+  # Optional
+  # Description: optional pod Tolerations
+  #  tolerations:
+  #    - key: "example-key"
+  #      operator: "Exists"
+  #      effect: "NoSchedule"
+  tolerations: []
+
+  # Optional
+  # Description: optional pod scheduler definition
+  # schedulerName: "scheduler"
+  schedulerName: ""
+
+  # Optional
+  # Description: optional pod node selector
+  # nodeSelector:
+  #  diskType: "ssd"
+  nodeSelector: {}
diff --git a/charts/fluid/fluid/CHANGELOG.md b/charts/fluid/fluid/CHANGELOG.md
@@ -53,4 +53,4 @@
 * Scale runtime controllers on demand
 
 ### 0.9.0
-* Support pass image pull secrets from fluid charts to alluxioruntime controller
+* Support pass image pull secrets from fluid charts to alluxioruntime controller