Allow overriding of hardcoded DaemonSet tolerations

awslabs · Jan 21, 2025 · f96af93 · f96af93
1 parent 135dfb0
commit f96af93
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/charts/aws-mountpoint-s3-csi-driver/templates/node.yaml b/charts/aws-mountpoint-s3-csi-driver/templates/node.yaml
@@ -31,15 +31,10 @@ spec:
         {{- if .Values.node.tolerateAllTaints }}
         - operator: Exists
         {{- else }}
-        - key: CriticalAddonsOnly
-          operator: Exists
-        - operator: Exists
-          effect: NoExecute
-          tolerationSeconds: 300
-        {{- end }}
         {{- with .Values.node.tolerations }}
         {{- toYaml . | nindent 8 }}
         {{- end }}
+        {{- end }}
       {{- if .Values.imagePullSecrets }}
       imagePullSecrets:
       {{- range .Values.imagePullSecrets }}

diff --git a/charts/aws-mountpoint-s3-csi-driver/values.yaml b/charts/aws-mountpoint-s3-csi-driver/values.yaml
@@ -35,6 +35,12 @@ node:
     limits:
       memory: 256Mi
   tolerateAllTaints: false
+  tolerations:
+    - key: CriticalAddonsOnly
+      operator: Exists
+    - operator: Exists
+      effect: NoExecute
+      tolerationSeconds: 300
   affinity:
     nodeAffinity:
       requiredDuringSchedulingIgnoredDuringExecution: