Modify the support method of Toleration (#899)

* modify set toleration way and add toleration for update serve * support toleration for update serve * update charts yaml
kubeflow · Feb 8, 2023 · c3da54d · c3da54d
1 parent e11d8f7
commit c3da54d
Show file tree

Hide file tree

Showing 25 changed files with 407 additions and 138 deletions.
diff --git a/charts/cron-tfjob/templates/_tfjob.yaml b/charts/cron-tfjob/templates/_tfjob.yaml
@@ -57,11 +57,17 @@ spec:
           {{- if ne (len .Values.tfjob.tolerations) 0 }}
           tolerations:
           {{- range $tolerationKey := .Values.tfjob.tolerations }}
-            {{- if eq $tolerationKey "all" }}
-            - operator: "Exists"
-            {{- else }}
-            - key: "{{ $tolerationKey }}"
-              operator: "Exists"
+          - {{- if $tolerationKey.key }}
+            key: "{{ $tolerationKey.key }}"
+            {{- end }}
+            {{- if $tolerationKey.value }}
+            value: "{{ $tolerationKey.value }}"
+            {{- end }}
+            {{- if $tolerationKey.effect }}
+            effect: "{{ $tolerationKey.effect }}"
+            {{- end }}
+            {{- if $tolerationKey.operator }}
+            operator: "{{ $tolerationKey.operator }}"
             {{- end }}
           {{- end }}
           {{- end }}
@@ -349,11 +355,17 @@ spec:
           {{- if ne (len .Values.tfjob.tolerations) 0 }}
           tolerations:
           {{- range $tolerationKey := .Values.tfjob.tolerations }}
-            {{- if eq $tolerationKey "all" }}
-            - operator: "Exists"
-            {{- else }}
-            - key: "{{ $tolerationKey }}"
-              operator: "Exists"
+          - {{- if $tolerationKey.key }}
+            key: "{{ $tolerationKey.key }}"
+            {{- end }}
+            {{- if $tolerationKey.value }}
+            value: "{{ $tolerationKey.value }}"
+            {{- end }}
+            {{- if $tolerationKey.effect }}
+            effect: "{{ $tolerationKey.effect }}"
+            {{- end }}
+            {{- if $tolerationKey.operator }}
+            operator: "{{ $tolerationKey.operator }}"
             {{- end }}
           {{- end }}
           {{- end }}
@@ -671,11 +683,17 @@ spec:
           {{- if ne (len .Values.tfjob.tolerations) 0 }}
           tolerations:
           {{- range $tolerationKey := .Values.tfjob.tolerations }}
-            {{- if eq $tolerationKey "all" }}
-            - operator: "Exists"
-            {{- else }}
-            - key: "{{ $tolerationKey }}"
-              operator: "Exists"
+          - {{- if $tolerationKey.key }}
+            key: "{{ $tolerationKey.key }}"
+            {{- end }}
+            {{- if $tolerationKey.value }}
+            value: "{{ $tolerationKey.value }}"
+            {{- end }}
+            {{- if $tolerationKey.effect }}
+            effect: "{{ $tolerationKey.effect }}"
+            {{- end }}
+            {{- if $tolerationKey.operator }}
+            operator: "{{ $tolerationKey.operator }}"
             {{- end }}
           {{- end }}
           {{- end }}
@@ -990,11 +1008,17 @@ spec:
           {{- if ne (len .Values.tfjob.tolerations) 0 }}
           tolerations:
           {{- range $tolerationKey := .Values.tfjob.tolerations }}
-            {{- if eq $tolerationKey "all" }}
-            - operator: "Exists"
-            {{- else }}
-            - key: "{{ $tolerationKey }}"
-              operator: "Exists"
+          - {{- if $tolerationKey.key }}
+            key: "{{ $tolerationKey.key }}"
+            {{- end }}
+            {{- if $tolerationKey.value }}
+            value: "{{ $tolerationKey.value }}"
+            {{- end }}
+            {{- if $tolerationKey.effect }}
+            effect: "{{ $tolerationKey.effect }}"
+            {{- end }}
+            {{- if $tolerationKey.operator }}
+            operator: "{{ $tolerationKey.operator }}"
             {{- end }}
           {{- end }}
           {{- end }}

diff --git a/charts/custom-serving/templates/deployment.yaml b/charts/custom-serving/templates/deployment.yaml
@@ -61,11 +61,17 @@ spec:
       {{- if ne (len .Values.tolerations) 0 }}
       tolerations:
       {{- range $tolerationKey := .Values.tolerations }}
-        {{- if eq $tolerationKey "all" }}
-        - operator: "Exists"
-        {{- else }}
-        - key: "{{ $tolerationKey }}"
-          operator: "Exists"
+      - {{- if $tolerationKey.key }}
+        key: "{{ $tolerationKey.key }}"
+        {{- end }}
+        {{- if $tolerationKey.value }}
+        value: "{{ $tolerationKey.value }}"
+        {{- end }}
+        {{- if $tolerationKey.effect }}
+        effect: "{{ $tolerationKey.effect }}"
+        {{- end }}
+        {{- if $tolerationKey.operator }}
+        operator: "{{ $tolerationKey.operator }}"
         {{- end }}
       {{- end }}
       {{- end }}

diff --git a/charts/etjob/templates/etjob.yaml b/charts/etjob/templates/etjob.yaml
@@ -59,12 +59,18 @@ spec:
           {{- if ne (len .Values.tolerations) 0 }}
           tolerations:
           {{- range $tolerationKey := .Values.tolerations }}
-          {{- if eq $tolerationKey "all" }}
-            - operator: "Exists"
-          {{- else }}
-            - key: "{{ $tolerationKey }}"
-            operator: "Exists"
-          {{- end }}
+          - {{- if $tolerationKey.key }}
+            key: "{{ $tolerationKey.key }}"
+            {{- end }}
+            {{- if $tolerationKey.value }}
+            value: "{{ $tolerationKey.value }}"
+            {{- end }}
+            {{- if $tolerationKey.effect }}
+            effect: "{{ $tolerationKey.effect }}"
+            {{- end }}
+            {{- if $tolerationKey.operator }}
+            operator: "{{ $tolerationKey.operator }}"
+            {{- end }}
           {{- end }}
           {{- end }}
           {{- if .Values.schedulerName }}
@@ -326,12 +332,18 @@ spec:
           {{- if ne (len .Values.tolerations) 0 }}
           tolerations:
           {{- range $tolerationKey := .Values.tolerations }}
-          {{- if eq $tolerationKey "all" }}
-          - operator: "Exists"
-          {{- else }}
-          - key: "{{ $tolerationKey }}"
-            operator: "Exists"
-          {{- end }}
+          - {{- if $tolerationKey.key }}
+            key: "{{ $tolerationKey.key }}"
+            {{- end }}
+            {{- if $tolerationKey.value }}
+            value: "{{ $tolerationKey.value }}"
+            {{- end }}
+            {{- if $tolerationKey.effect }}
+            effect: "{{ $tolerationKey.effect }}"
+            {{- end }}
+            {{- if $tolerationKey.operator }}
+            operator: "{{ $tolerationKey.operator }}"
+            {{- end }}
           {{- end }}
           {{- end }}
           {{- if .Values.schedulerName }}

diff --git a/charts/etjob/templates/tensorboard.yaml b/charts/etjob/templates/tensorboard.yaml
@@ -31,13 +31,19 @@ spec:
       {{- end }}
       {{- if ne (len .Values.tolerations) 0 }}
       tolerations:
-        {{- range $tolerationKey := .Values.tolerations }}
-        {{- if eq $tolerationKey "all" }}
-        - operator: "Exists"
-        {{- else }}
-        - key: "{{ $tolerationKey }}"
-          operator: "Exists"
-      {{- end }}
+      {{- range $tolerationKey := .Values.tolerations }}
+      - {{- if $tolerationKey.key }}
+        key: "{{ $tolerationKey.key }}"
+        {{- end }}
+        {{- if $tolerationKey.value }}
+        value: "{{ $tolerationKey.value }}"
+        {{- end }}
+        {{- if $tolerationKey.effect }}
+        effect: "{{ $tolerationKey.effect }}"
+        {{- end }}
+        {{- if $tolerationKey.operator }}
+        operator: "{{ $tolerationKey.operator }}"
+        {{- end }}
       {{- end }}
       {{- end }}
       affinity:

diff --git a/charts/evaluatejob/templates/job.yaml b/charts/evaluatejob/templates/job.yaml
@@ -52,11 +52,17 @@ spec:
       {{- if ne (len .Values.tolerations) 0 }}
       tolerations:
       {{- range $tolerationKey := .Values.tolerations }}
-        {{- if eq $tolerationKey "all" }}
-        - operator: "Exists"
-        {{- else }}
-        - key: "{{ $tolerationKey }}"
-          operator: "Exists"
+      - {{- if $tolerationKey.key }}
+        key: "{{ $tolerationKey.key }}"
+        {{- end }}
+        {{- if $tolerationKey.value }}
+        value: "{{ $tolerationKey.value }}"
+        {{- end }}
+        {{- if $tolerationKey.effect }}
+        effect: "{{ $tolerationKey.effect }}"
+        {{- end }}
+        {{- if $tolerationKey.operator }}
+        operator: "{{ $tolerationKey.operator }}"
         {{- end }}
       {{- end }}
       {{- end }}

diff --git a/charts/modeljob/templates/job.yaml b/charts/modeljob/templates/job.yaml
@@ -57,11 +57,17 @@ spec:
       {{- if ne (len .Values.tolerations) 0 }}
       tolerations:
       {{- range $tolerationKey := .Values.tolerations }}
-        {{- if eq $tolerationKey "all" }}
-        - operator: "Exists"
-        {{- else }}
-        - key: "{{ $tolerationKey }}"
-          operator: "Exists"
+      - {{- if $tolerationKey.key }}
+        key: "{{ $tolerationKey.key }}"
+        {{- end }}
+        {{- if $tolerationKey.value }}
+        value: "{{ $tolerationKey.value }}"
+        {{- end }}
+        {{- if $tolerationKey.effect }}
+        effect: "{{ $tolerationKey.effect }}"
+        {{- end }}
+        {{- if $tolerationKey.operator }}
+        operator: "{{ $tolerationKey.operator }}"
         {{- end }}
       {{- end }}
       {{- end }}

diff --git a/charts/mpijob/templates/mpijob.yaml b/charts/mpijob/templates/mpijob.yaml
@@ -65,11 +65,17 @@ spec:
       {{- if ne (len .Values.tolerations) 0 }}
       tolerations:
       {{- range $tolerationKey := .Values.tolerations }}
-        {{- if eq $tolerationKey "all" }}
-        - operator: "Exists"
-        {{- else }}
-        - key: "{{ $tolerationKey }}"
-          operator: "Exists"
+      - {{- if $tolerationKey.key }}
+        key: "{{ $tolerationKey.key }}"
+        {{- end }}
+        {{- if $tolerationKey.value }}
+        value: "{{ $tolerationKey.value }}"
+        {{- end }}
+        {{- if $tolerationKey.effect }}
+        effect: "{{ $tolerationKey.effect }}"
+        {{- end }}
+        {{- if $tolerationKey.operator }}
+        operator: "{{ $tolerationKey.operator }}"
         {{- end }}
       {{- end }}
       {{- end }}

diff --git a/charts/pytorchjob/templates/pytorchjob.yaml b/charts/pytorchjob/templates/pytorchjob.yaml
@@ -58,11 +58,17 @@ spec:
           {{- if ne (len .Values.tolerations) 0 }}
           tolerations:
           {{- range $tolerationKey := .Values.tolerations }}
-            {{- if eq $tolerationKey "all" }}
-            - operator: "Exists"
-            {{- else }}
-            - key: "{{ $tolerationKey }}"
-              operator: "Exists"
+          - {{- if $tolerationKey.key }}
+            key: "{{ $tolerationKey.key }}"
+            {{- end }}
+            {{- if $tolerationKey.value }}
+            value: "{{ $tolerationKey.value }}"
+            {{- end }}
+            {{- if $tolerationKey.effect }}
+            effect: "{{ $tolerationKey.effect }}"
+            {{- end }}
+            {{- if $tolerationKey.operator }}
+            operator: "{{ $tolerationKey.operator }}"
             {{- end }}
           {{- end }}
           {{- end }}
@@ -344,12 +350,18 @@ spec:
           {{- if ne (len .Values.tolerations) 0 }}
           tolerations:
           {{- range $tolerationKey := .Values.tolerations }}
-          {{- if eq $tolerationKey "all" }}
-          - operator: "Exists"
-          {{- else }}
-          - key: "{{ $tolerationKey }}"
-            operator: "Exists"
-          {{- end }}
+          - {{- if $tolerationKey.key }}
+            key: "{{ $tolerationKey.key }}"
+            {{- end }}
+            {{- if $tolerationKey.value }}
+            value: "{{ $tolerationKey.value }}"
+            {{- end }}
+            {{- if $tolerationKey.effect }}
+            effect: "{{ $tolerationKey.effect }}"
+            {{- end }}
+            {{- if $tolerationKey.operator }}
+            operator: "{{ $tolerationKey.operator }}"
+            {{- end }}
           {{- end }}
           {{- end }}
           {{- if .Values.schedulerName }}

diff --git a/charts/pytorchjob/templates/tensorboard.yaml b/charts/pytorchjob/templates/tensorboard.yaml
@@ -31,13 +31,19 @@ spec:
       {{- end }}
       {{- if ne (len .Values.tolerations) 0 }}
       tolerations:
-        {{- range $tolerationKey := .Values.tolerations }}
-        {{- if eq $tolerationKey "all" }}
-        - operator: "Exists"
-        {{- else }}
-        - key: "{{ $tolerationKey }}"
-          operator: "Exists"
-      {{- end }}
+      {{- range $tolerationKey := .Values.tolerations }}
+      - {{- if $tolerationKey.key }}
+        key: "{{ $tolerationKey.key }}"
+        {{- end }}
+        {{- if $tolerationKey.value }}
+        value: "{{ $tolerationKey.value }}"
+        {{- end }}
+        {{- if $tolerationKey.effect }}
+        effect: "{{ $tolerationKey.effect }}"
+        {{- end }}
+        {{- if $tolerationKey.operator }}
+        operator: "{{ $tolerationKey.operator }}"
+        {{- end }}
       {{- end }}
       {{- end }}
       affinity:

diff --git a/charts/tfjob/templates/deployment.yaml b/charts/tfjob/templates/deployment.yaml
@@ -30,11 +30,17 @@ spec:
       {{- if ne (len .Values.tolerations) 0 }}
       tolerations:
       {{- range $tolerationKey := .Values.tolerations }}
-        {{- if eq $tolerationKey "all" }}
-        - operator: "Exists"
-        {{- else }}
-        - key: "{{ $tolerationKey }}"
-          operator: "Exists"
+      - {{- if $tolerationKey.key }}
+        key: "{{ $tolerationKey.key }}"
+        {{- end }}
+        {{- if $tolerationKey.value }}
+        value: "{{ $tolerationKey.value }}"
+        {{- end }}
+        {{- if $tolerationKey.effect }}
+        effect: "{{ $tolerationKey.effect }}"
+        {{- end }}
+        {{- if $tolerationKey.operator }}
+        operator: "{{ $tolerationKey.operator }}"
         {{- end }}
       {{- end }}
       {{- end }}