Add node selectors and tolerations (#52)

mlrun · Jan 13, 2023 · a77b2d4 · a77b2d4
1 parent ebd0c84
commit a77b2d4
Show file tree

Hide file tree

Showing 14 changed files with 86 additions and 1 deletion.
diff --git a/charts/mlrun-ce/Chart.yaml b/charts/mlrun-ce/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v1
-version: 0.5.2-rc1
+version: 0.5.2-rc2
 name: mlrun-ce
 description: MLRUn Open Source Stack
 home: https://iguazio.com

diff --git a/charts/mlrun-ce/templates/jupyter-notebook/deployment.yaml b/charts/mlrun-ce/templates/jupyter-notebook/deployment.yaml
@@ -74,6 +74,12 @@ spec:
         - --NotebookApp.token=''
         - --NotebookApp.password=''
         - --NotebookApp.default_url="/lab"
+      {{- with .Values.jupyterNotebook.nodeSelector }}
+      nodeSelector: {{ toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.jupyterNotebook.tolerations }}
+      tolerations: {{ toYaml . | nindent 8 }}
+      {{- end }}
       volumes:
       - name: notebooks
         persistentVolumeClaim:

diff --git a/charts/mlrun-ce/templates/pipelines/deployments/metadata-envoy-deployment.yaml b/charts/mlrun-ce/templates/pipelines/deployments/metadata-envoy-deployment.yaml
@@ -50,4 +50,10 @@ spec:
       schedulerName: default-scheduler
       securityContext: {}
       terminationGracePeriodSeconds: 30
+      {{- with .Values.pipelines.nodeSelector }}
+      nodeSelector: {{ toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.pipelines.tolerations }}
+      tolerations: {{ toYaml . | nindent 8 }}
+      {{- end }}
 {{- end -}}
diff --git a/charts/mlrun-ce/templates/pipelines/deployments/metadata-grpc-deployment.yaml b/charts/mlrun-ce/templates/pipelines/deployments/metadata-grpc-deployment.yaml
@@ -99,4 +99,10 @@ spec:
       serviceAccount: metadata-grpc-server
       serviceAccountName: metadata-grpc-server
       terminationGracePeriodSeconds: 30
+      {{- with .Values.pipelines.nodeSelector }}
+      nodeSelector: {{ toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.pipelines.tolerations }}
+      tolerations: {{ toYaml . | nindent 8 }}
+      {{- end }}
 {{- end -}}
diff --git a/charts/mlrun-ce/templates/pipelines/deployments/metadata-writer.yaml b/charts/mlrun-ce/templates/pipelines/deployments/metadata-writer.yaml
@@ -49,4 +49,10 @@ spec:
       serviceAccount: kubeflow-pipelines-metadata-writer
       serviceAccountName: kubeflow-pipelines-metadata-writer
       terminationGracePeriodSeconds: 30
+      {{- with .Values.pipelines.nodeSelector }}
+      nodeSelector: {{ toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.pipelines.tolerations }}
+      tolerations: {{ toYaml . | nindent 8 }}
+      {{- end }}
 {{- end -}}
diff --git a/charts/mlrun-ce/templates/pipelines/deployments/ml-pipeline-persistenceagent.yaml b/charts/mlrun-ce/templates/pipelines/deployments/ml-pipeline-persistenceagent.yaml
@@ -58,4 +58,10 @@ spec:
       serviceAccount: ml-pipeline-persistenceagent
       serviceAccountName: ml-pipeline-persistenceagent
       terminationGracePeriodSeconds: 30
+      {{- with .Values.pipelines.nodeSelector }}
+      nodeSelector: {{ toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.pipelines.tolerations }}
+      tolerations: {{ toYaml . | nindent 8 }}
+      {{- end }}
 {{- end -}}
diff --git a/charts/mlrun-ce/templates/pipelines/deployments/ml-pipeline-scheduledworkflow.yaml b/charts/mlrun-ce/templates/pipelines/deployments/ml-pipeline-scheduledworkflow.yaml
@@ -56,4 +56,10 @@ spec:
       serviceAccount: ml-pipeline-scheduledworkflow
       serviceAccountName: ml-pipeline-scheduledworkflow
       terminationGracePeriodSeconds: 30
+      {{- with .Values.pipelines.nodeSelector }}
+      nodeSelector: {{ toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.pipelines.tolerations }}
+      tolerations: {{ toYaml . | nindent 8 }}
+      {{- end }}
 {{- end -}}
diff --git a/charts/mlrun-ce/templates/pipelines/deployments/ml-pipeline-ui.yaml b/charts/mlrun-ce/templates/pipelines/deployments/ml-pipeline-ui.yaml
@@ -112,4 +112,10 @@ spec:
           defaultMode: 420
           name: ml-pipeline-ui-configmap
         name: config-volume
+      {{- with .Values.pipelines.nodeSelector }}
+      nodeSelector: {{ toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.pipelines.tolerations }}
+      tolerations: {{ toYaml . | nindent 8 }}
+      {{- end }}
 {{- end -}}
diff --git a/charts/mlrun-ce/templates/pipelines/deployments/ml-pipeline-viewer-crd.yaml b/charts/mlrun-ce/templates/pipelines/deployments/ml-pipeline-viewer-crd.yaml
@@ -52,4 +52,10 @@ spec:
       serviceAccount: ml-pipeline-viewer-crd-service-account
       serviceAccountName: ml-pipeline-viewer-crd-service-account
       terminationGracePeriodSeconds: 30
+      {{- with .Values.pipelines.nodeSelector }}
+      nodeSelector: {{ toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.pipelines.tolerations }}
+      tolerations: {{ toYaml . | nindent 8 }}
+      {{- end }}
 {{- end -}}
diff --git a/charts/mlrun-ce/templates/pipelines/deployments/ml-pipeline-visualizationserver.yaml b/charts/mlrun-ce/templates/pipelines/deployments/ml-pipeline-visualizationserver.yaml
@@ -80,4 +80,10 @@ spec:
       serviceAccount: ml-pipeline-visualizationserver
       serviceAccountName: ml-pipeline-visualizationserver
       terminationGracePeriodSeconds: 30
+      {{- with .Values.pipelines.nodeSelector }}
+      nodeSelector: {{ toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.pipelines.tolerations }}
+      tolerations: {{ toYaml . | nindent 8 }}
+      {{- end }}
 {{- end -}}
diff --git a/charts/mlrun-ce/templates/pipelines/deployments/ml-pipeline.yaml b/charts/mlrun-ce/templates/pipelines/deployments/ml-pipeline.yaml
@@ -148,4 +148,10 @@ spec:
       serviceAccount: ml-pipeline
       serviceAccountName: ml-pipeline
       terminationGracePeriodSeconds: 30
+      {{- with .Values.pipelines.nodeSelector }}
+      nodeSelector: {{ toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.pipelines.tolerations }}
+      tolerations: {{ toYaml . | nindent 8 }}
+      {{- end }}
 {{- end -}}
diff --git a/charts/mlrun-ce/templates/pipelines/deployments/mysql.yaml b/charts/mlrun-ce/templates/pipelines/deployments/mysql.yaml
@@ -61,4 +61,10 @@ spec:
       - name: mysql-persistent-storage
         persistentVolumeClaim:
           claimName: mysql-pv-claim
+      {{- with .Values.pipelines.nodeSelector }}
+      nodeSelector: {{ toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.pipelines.tolerations }}
+      tolerations: {{ toYaml . | nindent 8 }}
+      {{- end }}
 {{- end -}}
diff --git a/charts/mlrun-ce/templates/pipelines/deployments/workflow-controller.yaml b/charts/mlrun-ce/templates/pipelines/deployments/workflow-controller.yaml
@@ -86,4 +86,10 @@ spec:
       serviceAccount: argo
       serviceAccountName: argo
       terminationGracePeriodSeconds: 30
+      {{- with .Values.pipelines.nodeSelector }}
+      nodeSelector: {{ toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.pipelines.tolerations }}
+      tolerations: {{ toYaml . | nindent 8 }}
+      {{- end }}
 {{- end -}}
diff --git a/charts/mlrun-ce/values.yaml b/charts/mlrun-ce/values.yaml
@@ -201,6 +201,13 @@ jupyterNotebook:
     annotations:
       helm.sh/resource-policy: "keep"
 
+  nodeSelector: {}
+    # node-role.kubernetes.io/node: "true"
+    # tier: cs
+  tolerations: []
+    #  - key: "node-role.kubernetes.io/master"
+    #    effect: NoSchedule
+
 mpi-operator:
   fullnameOverride: mpi-operator
   crd:
@@ -259,6 +266,12 @@ pipelines:
     size: "20Gi"
     annotations:
       helm.sh/resource-policy: "keep"
+  nodeSelector: {}
+    # node-role.kubernetes.io/node: "true"
+    # tier: cs
+  tolerations: []
+    #  - key: "node-role.kubernetes.io/master"
+    #    effect: NoSchedule
   db:
     username: root
   minio: