added toleration support for iam operator jupyter (#18)

datalayer · Aug 2, 2024 · b57c076 · b57c076
1 parent aff0d10
commit b57c076
Show file tree

Hide file tree

Showing 6 changed files with 57 additions and 0 deletions.
diff --git a/charts/datalayer-iam/templates/deployment.yaml b/charts/datalayer-iam/templates/deployment.yaml
@@ -24,6 +24,9 @@ spec:
       {{- with .Values.iam.affinity }}
       affinity: {{- toYaml . | nindent 8 }}
       {{- end }}
+      {{- with .Values.iam.tolerations }}
+      tolerations: {{- toYaml . | nindent 8 }}
+      {{- end }}
       imagePullSecrets:
         - name: reg-creds
       containers:

diff --git a/charts/datalayer-iam/tests/deployment_test.yaml b/charts/datalayer-iam/tests/deployment_test.yaml
@@ -16,6 +16,22 @@ tests:
                       operator: In
                       values:
                       - "true"
+  - it: "test tolerations"
+    set:
+      iam.tolerations:
+        - key: "key1"
+          operator: "Equal"
+          value: "value1"
+          effect: "NoSchedule"
+    asserts:
+      - isSubset:
+          path: spec.template.spec
+          content:
+            tolerations:
+              - key: "key1"
+                operator: "Equal"
+                value: "value1"
+                effect: "NoSchedule"
   - it: "test environment variables"
     asserts:
       - isSubset:

diff --git a/charts/datalayer-jupyter/templates/deployment.yaml b/charts/datalayer-jupyter/templates/deployment.yaml
@@ -24,6 +24,9 @@ spec:
       {{- with .Values.jupyter.affinity }}
       affinity: {{- toYaml . | nindent 8 }}
       {{- end }}
+      {{- with .Values.jupyter.tolerations }}
+      tolerations: {{- toYaml . | nindent 8 }}
+      {{- end }}
       imagePullSecrets:
             - name: reg-creds
       containers:

diff --git a/charts/datalayer-jupyter/tests/deployment_test.yaml b/charts/datalayer-jupyter/tests/deployment_test.yaml
@@ -16,6 +16,22 @@ tests:
                       operator: In
                       values:
                       - "true"
+  - it: "test tolerations"
+    set:
+      jupyter.tolerations:
+        - key: "key1"
+          operator: "Equal"
+          value: "value1"
+          effect: "NoSchedule"
+    asserts:
+      - isSubset:
+          path: spec.template.spec
+          content:
+            tolerations:
+              - key: "key1"
+                operator: "Equal"
+                value: "value1"
+                effect: "NoSchedule"
   - it: "test environment variables"
     asserts:
       - isSubset:

diff --git a/charts/datalayer-operator/templates/deployment.yaml b/charts/datalayer-operator/templates/deployment.yaml
@@ -24,6 +24,9 @@ spec:
       {{- with .Values.operator.affinity }}
       affinity: {{- toYaml . | nindent 8 }}
       {{- end }}
+      {{- with .Values.operator.tolerations }}
+      tolerations: {{- toYaml . | nindent 8 }}
+      {{- end }}
       imagePullSecrets:
         - name: reg-creds
       containers:

diff --git a/charts/datalayer-operator/tests/deployment_test.yaml b/charts/datalayer-operator/tests/deployment_test.yaml
@@ -16,6 +16,22 @@ tests:
                       operator: In
                       values:
                       - "true"
+  - it: "test tolerations"
+    set:
+      operator.tolerations:
+        - key: "key1"
+          operator: "Equal"
+          value: "value1"
+          effect: "NoSchedule"
+    asserts:
+      - isSubset:
+          path: spec.template.spec
+          content:
+            tolerations:
+              - key: "key1"
+                operator: "Equal"
+                value: "value1"
+                effect: "NoSchedule"
   - it: "test environment variables"
     asserts:
       - isSubset: