Add node selection ability for webhook helm tests

Signed-off-by: David McDaniel <[email protected]> Signed-off-by: David McDaniel <[email protected]>
piraeusdatastore · Nov 14, 2023 · f40542a · f40542a
1 parent 88d05f1
commit f40542a
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 0 deletions.
diff --git a/charts/snapshot-controller/README.md b/charts/snapshot-controller/README.md
@@ -168,6 +168,9 @@ available.
 | `webhook.affinity`                           | Affinity to set on each webhook pod.                                                                                   | `{}`                                                                                               |
 | `webhook.serviceAccount.create`              | Create the service account resource                                                                                    | `true`                                                                                             |
 | `webhook.serviceAccount.name`                | Sets the name of the service account. If left empty, will use the release name as default                              | `""`                                                                                               |
+| `webhook.tests.nodeSelector`                 | Node selector to add to each helm test pod.                                                                            | `{}`                                                                                               |
+| `webhook.tests.tolerations`                  | Tolerations to add to each helm test pod.                                                                              | `[]`                                                                                               |
+| `webhook.tests.affinity`                     | Affinity to set on each helm test pod.                                                                                 | `{}`                                                                                               |
 
 
 [`3.x.x` releases]: https://github.com/kubernetes-csi/external-snapshotter/releases

diff --git a/charts/snapshot-controller/templates/tests/test-invalid-body.yaml b/charts/snapshot-controller/templates/tests/test-invalid-body.yaml
@@ -16,5 +16,17 @@ spec:
         - -exc
         - |
           curl -kfsS -X POST -H 'Content-Type: application/json' -d '{{ .Files.Get "tests/invalid-admission.json" | trim }}' https://{{ include "snapshot-validation-webhook.fullname" . }}/volumesnapshot | grep -c '"allowed":false'
+  {{- with .Values.webhook.tests.nodeSelector }}
+  nodeSelector:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  {{- with .Values.webhook.tests.affinity }}
+  affinity:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  {{- with .Values.webhook.tests.tolerations }}
+  tolerations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
   restartPolicy: Never
 {{- end }}
diff --git a/charts/snapshot-controller/templates/tests/test-valid-body.yaml b/charts/snapshot-controller/templates/tests/test-valid-body.yaml
@@ -16,5 +16,17 @@ spec:
         - -exc
         - |
           curl -kfsS -X POST -H 'Content-Type: application/json' -d '{{ .Files.Get "tests/valid-admission.json" | trim }}' https://{{ include "snapshot-validation-webhook.fullname" . }}/volumesnapshot | grep -c '"allowed":true'
+  {{- with .Values.webhook.tests.nodeSelector }}
+  nodeSelector:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  {{- with .Values.webhook.tests.affinity }}
+  affinity:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  {{- with .Values.webhook.tests.tolerations }}
+  tolerations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
   restartPolicy: Never
 {{- end }}
diff --git a/charts/snapshot-controller/values.yaml b/charts/snapshot-controller/values.yaml
@@ -150,3 +150,10 @@ webhook:
 
   rbac:
     create: true
+
+  tests:
+    nodeSelector: { }
+
+    tolerations: [ ]
+
+    affinity: { }