Added scheduling.tolerations

nano-byte · Aug 29, 2023 · fcc54ba · fcc54ba
1 parent ee06bc9
commit fcc54ba
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 3 deletions.
diff --git a/charts/generic-service/README.md b/charts/generic-service/README.md
@@ -79,6 +79,7 @@ app:
 | `scheduling.nodeSelector`           | `{}`                        | Labels to select nodes this service may be run on                                                        |
 | `scheduling.nodePeferences`         | `{}`                        | Sets of label values to select nodes this service should be run on if possible                           |
 | `scheduling.nodeExclusions`         | `{}`                        | Sets of label values to select nodes this service must not run on                                        |
+| `scheduling.tolerations`            | `[]`                        | Taints on nodes this service can tolerate                                                                |
 | `scheduling.podAffinity`            | `{}`                        | Labels to select other pods this service should share nodes with if possible                             |
 | `scheduling.podAntiAffinity`        | `{}`                        | Labels to select other pods this service must not share nodes with                                       |
 | `scheduling.replicaSpread`          | `BestEffort`                | How to spread replicas across nodes (`BestEffort`, `Strict`, `None`)                                     |

diff --git a/charts/generic-service/ci/scheduling-values.yaml b/charts/generic-service/ci/scheduling-values.yaml
@@ -10,6 +10,7 @@ scheduling:
     someKey: [someValue1, someValue2]
   nodeExclusions:
     otherKey: [otherValue1, otherValue2]
+  tolerations: [someTaint]
   podAffinity:
     someKey: someValue
   podAntiAffinity:

diff --git a/charts/generic-service/templates/controller.yaml b/charts/generic-service/templates/controller.yaml
@@ -252,11 +252,13 @@ spec:
 
       {{- if .Values.scheduling.nodeSelector }}
       nodeSelector: {{- .Values.scheduling.nodeSelector | toYaml | nindent 8 }}
+      {{- end }}
+
+      {{- if .Values.scheduling.tolerations }}
       tolerations:
-        {{- range $key, $val := .Values.scheduling.nodeSelector }}
+        {{- range $key:= .Values.scheduling.tolerations }}
         - key: {{ $key | quote }}
-          operator: Equal
-          value: {{ $val | quote }}
+          operator: Exists
         {{- end }}
       {{- end }}
 

diff --git a/charts/generic-service/values.schema.json b/charts/generic-service/values.schema.json
@@ -386,6 +386,11 @@
           },
           "description": "Sets of label values to select nodes this service must not run on"
         },
+        "tolerations": {
+          "type": "array",
+          "items": {"type": "string"},
+          "description": "Taints on nodes this service can tolerate"
+        },
         "podAffinity": {
           "type": "object",
           "additionalProperties": {"type": "string"},

diff --git a/charts/generic-service/values.yaml b/charts/generic-service/values.yaml
@@ -83,6 +83,7 @@ scheduling:
   nodeSelector: {}
   nodePreferences: {}
   nodeExclusions: {}
+  tolerations: []
   podAffinity: {}
   podAntiAffinity: {}
   replicaSpread: BestEffort