This is an automated email from the ASF dual-hosted git repository.
rexxiong pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/celeborn.git
The following commit(s) were added to refs/heads/main by this push:
new d93b927d2 [CELEBORN-1955][HELM] Split nodeSelector into
master.nodeSelector and worker.nodeSelector
d93b927d2 is described below
commit d93b927d22c3c60d32cef3136aee15051debfb3f
Author: Yi Chen <[email protected]>
AuthorDate: Tue Apr 15 10:08:35 2025 +0800
[CELEBORN-1955][HELM] Split nodeSelector into master.nodeSelector and
worker.nodeSelector
### What changes were proposed in this pull request?
Split `nodeSelector` into `master.nodeSelector` and `worker.nodeSelector`.
### Why are the changes needed?
Users are able to configure nodeSelector for Celeborn master and worker
pods separately.
### Does this PR introduce _any_ user-facing change?
Yes.
### How was this patch tested?
Run Helm unit tests by `helm unittest charts/celeborn --file
"tests/**/*_test.yaml" --strict --debug`.
Closes #3210 from ChenYi015/helm/node-selector.
Authored-by: Yi Chen <[email protected]>
Signed-off-by: Shuang <[email protected]>
---
charts/celeborn/templates/master/statefulset.yaml | 2 +-
charts/celeborn/templates/worker/statefulset.yaml | 2 +-
charts/celeborn/tests/master/statefulset_test.yaml | 9 +++++----
charts/celeborn/tests/worker/statefulset_test.yaml | 9 +++++----
charts/celeborn/values.yaml | 13 +++++++++----
5 files changed, 21 insertions(+), 14 deletions(-)
diff --git a/charts/celeborn/templates/master/statefulset.yaml
b/charts/celeborn/templates/master/statefulset.yaml
index 4d4c82c77..ca32a32b5 100644
--- a/charts/celeborn/templates/master/statefulset.yaml
+++ b/charts/celeborn/templates/master/statefulset.yaml
@@ -122,7 +122,7 @@ spec:
{{ fail "For now Celeborn Helm only support emptyDir or hostPath volume
types" }}
{{- end }}
{{- end }}
- {{- with .Values.nodeSelector }}
+ {{- with .Values.master.nodeSelector }}
nodeSelector:
{{- toYaml . | nindent 8 }}
{{- end }}
diff --git a/charts/celeborn/templates/worker/statefulset.yaml
b/charts/celeborn/templates/worker/statefulset.yaml
index 9bc5ce4d0..b03bf2530 100644
--- a/charts/celeborn/templates/worker/statefulset.yaml
+++ b/charts/celeborn/templates/worker/statefulset.yaml
@@ -125,7 +125,7 @@ spec:
{{ fail "Currently, Celeborn chart only supports 'emptyDir' and
'hostPath' volume types" }}
{{- end }}
{{- end }}
- {{- with .Values.nodeSelector }}
+ {{- with .Values.worker.nodeSelector }}
nodeSelector:
{{- toYaml . | nindent 8 }}
{{- end }}
diff --git a/charts/celeborn/tests/master/statefulset_test.yaml
b/charts/celeborn/tests/master/statefulset_test.yaml
index 74d4d8cc7..982e90c24 100644
--- a/charts/celeborn/tests/master/statefulset_test.yaml
+++ b/charts/celeborn/tests/master/statefulset_test.yaml
@@ -71,11 +71,12 @@ tests:
path: spec.template.spec.imagePullSecrets[1].name
value: test-secret2
- - it: Should add node selector if `nodeSelector` is set
+ - it: Should add node selector if `master.nodeSelector` is set
set:
- nodeSelector:
- key1: value1
- key2: value2
+ master:
+ nodeSelector:
+ key1: value1
+ key2: value2
asserts:
- equal:
path: spec.template.spec.nodeSelector.key1
diff --git a/charts/celeborn/tests/worker/statefulset_test.yaml
b/charts/celeborn/tests/worker/statefulset_test.yaml
index 9080011bf..873511a67 100644
--- a/charts/celeborn/tests/worker/statefulset_test.yaml
+++ b/charts/celeborn/tests/worker/statefulset_test.yaml
@@ -71,11 +71,12 @@ tests:
path: spec.template.spec.imagePullSecrets[1].name
value: test-secret2
- - it: Should add node selector if `nodeSelector` is set
+ - it: Should add node selector if `worker.nodeSelector` is set
set:
- nodeSelector:
- key1: value1
- key2: value2
+ worker:
+ nodeSelector:
+ key1: value1
+ key2: value2
asserts:
- equal:
path: spec.template.spec.nodeSelector.key1
diff --git a/charts/celeborn/values.yaml b/charts/celeborn/values.yaml
index 54077177e..072bd0709 100644
--- a/charts/celeborn/values.yaml
+++ b/charts/celeborn/values.yaml
@@ -192,16 +192,21 @@ master:
# key1: value1
# key2: value2
+ # -- Node selector for Celeborn master pods.
+ nodeSelector:
+ # key1: value1
+ # key2: value2
+
worker:
# -- Annotations for Celeborn worker pods.
annotations:
# key1: value1
# key2: value2
-# -- Pod node selector
-nodeSelector: {}
-# key1: value1
-# key2: value2
+ # -- Node selector for Celeborn worker pods.
+ nodeSelector:
+ # key1: value1
+ # key2: value2
# -- Pod tolerations
tolerations: []
