Add toleration support

traefik · Jun 19, 2023 · 502ee88 · 502ee88
1 parent 0af41ab
commit 502ee88
Show file tree

Hide file tree

Showing 6 changed files with 98 additions and 1 deletion.
diff --git a/traefikee/Chart.yaml b/traefikee/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: traefikee
-version: 1.13.0
+version: 1.14.0
 appVersion: v2.10.1
 # Because of https://github.com/helm/helm/issues/3810 the pre-release version suffix has to be define.
 # This allows the installation on Kubernetes cluster with a pre-release version (e.g. v1.19.9-gke.1900)

diff --git a/traefikee/templates/proxy/deployment.yaml b/traefikee/templates/proxy/deployment.yaml
@@ -48,6 +48,10 @@ spec:
       affinity:
         {{- tpl (toYaml .Values.proxy.affinity) . | nindent 8 }}
       {{- end }}
+      {{- if .Values.proxy.tolerations }}
+      tolerations:
+        {{- tpl (toYaml .Values.proxy.tolerations) . | nindent 8 }}
+      {{- end }}
       {{- with .Values.priorityClassName }}
       priorityClassName: {{ . }}
       {{- end }}

diff --git a/traefikee/templates/stateful-sets.yaml b/traefikee/templates/stateful-sets.yaml
@@ -65,6 +65,10 @@ spec:
       affinity:
         {{- tpl (toYaml .Values.registry.affinity) . | nindent 8 }}
       {{- end }}
+      {{- if .Values.registry.tolerations }}
+      tolerations:
+        {{- tpl (toYaml .Values.registry.tolerations) . | nindent 8 }}
+      {{- end }}      
       {{- with .Values.priorityClassName }}
       priorityClassName: {{ . }}
       {{- end }}
@@ -203,6 +207,10 @@ spec:
       affinity:
         {{- tpl (toYaml .Values.controller.affinity) . | nindent 8 }}
       {{- end }}
+      {{- if .Values.controller.tolerations }}
+      tolerations:
+        {{- tpl (toYaml .Values.controller.tolerations) . | nindent 8 }}
+      {{- end }}   
       {{- with .Values.priorityClassName }}
       priorityClassName: {{ . }}
       {{- end }}

diff --git a/traefikee/tests/controller_test.yaml b/traefikee/tests/controller_test.yaml
@@ -335,3 +335,55 @@ tests:
               cpu: "300m"
               memory: "150Mi"
         documentIndex: 2
+  - it: should not set tolerations by default
+    asserts:
+      - isNull:
+          path: spec.template.spec.tolerations
+  - it: should be possible to set tolerations for controller
+    set:
+      controller:
+        tolerations:
+          - key: "testkey"
+            operator: "Equal"
+            value: "testvalue"
+            effect: "NoSchedule"
+          - key: "RSA"
+            operator: "Destructor"
+    documentIndex: 2
+    asserts:
+      - contains:
+          path: spec.template.spec.tolerations
+          content:
+            key: "testkey"
+            operator: "Equal"
+            value: "testvalue"
+            effect: "NoSchedule"
+      - contains:
+          path: spec.template.spec.tolerations
+          content:
+            key: "RSA"
+            operator: "Destructor"
+  - it: should be possible to set tolerations for registry
+    set:     
+      registry:
+        tolerations:
+          - key: "testkey"
+            operator: "Equal"
+            value: "testvalue"
+            effect: "NoSchedule"
+          - key: "RSA"
+            operator: "Destructor"
+    documentIndex: 1       
+    asserts:
+      - contains:
+          path: spec.template.spec.tolerations
+          content:
+            key: "testkey"
+            operator: "Equal"
+            value: "testvalue"
+            effect: "NoSchedule"
+      - contains:
+          path: spec.template.spec.tolerations
+          content:
+            key: "RSA"
+            operator: "Destructor" 
diff --git a/traefikee/tests/proxy_test.yaml b/traefikee/tests/proxy_test.yaml
@@ -174,6 +174,33 @@ tests:
                 maxSkew: 1
                 topologyKey: kubernetes.io/hostname
                 whenUnsatisfiable: DoNotSchedule
+  - it: should not set tolerations by default
+    asserts:
+      - isNull:
+          path: spec.template.spec.tolerations
+  - it: should be possible to set tolerations
+    set:
+      proxy:
+        tolerations:
+          - key: "testkey"
+            operator: "Equal"
+            value: "testvalue"
+            effect: "NoSchedule"
+          - key: "RSA"
+            operator: "Destructor"
+    asserts:
+      - contains:
+          path: spec.template.spec.tolerations
+          content:
+            key: "testkey"
+            operator: "Equal"
+            value: "testvalue"
+            effect: "NoSchedule"
+      - contains:
+          path: spec.template.spec.tolerations
+          content:
+            key: "RSA"
+            operator: "Destructor"            
 ---
 suite: proxy service test
 templates:

diff --git a/traefikee/values.yaml b/traefikee/values.yaml
@@ -59,6 +59,8 @@ registry:
 #    namespace: othernamespace
 ## Set the registry token directly in Values
 #  tokenSecret: "NJ00yx60K+Wm1yufuBM6fLq3fVKcv44RvBsVGiH40+U="
+## Tolerations allow the scheduler to schedule pods with matching taints.
+  tolerations: []
 
 
 controller:
@@ -118,6 +120,8 @@ controller:
 #        secretKeyRef:
 #          name: foo
 #          key: BAR
+## Tolerations allow the scheduler to schedule pods with matching taints.
+  tolerations: []
 
 proxy:
   replicas: 2
@@ -200,6 +204,8 @@ proxy:
 #      maxSkew: 1
 #      topologyKey: kubernetes.io/hostname
 #      whenUnsatisfiable: DoNotSchedule
+## Tolerations allow the scheduler to schedule pods with matching taints.
+  tolerations: []
 
 # priorityClassName will be set on all pods.
 priorityClassName: ""