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 8b2f50ab1 [CELEBORN-1972][ ][HELM] Rename affinity.{master,worker} to
{master,worker}.affinity
8b2f50ab1 is described below
commit 8b2f50ab1617d677f2a867bdbb13cff465b4556c
Author: Yi Chen <[email protected]>
AuthorDate: Mon Apr 28 11:15:30 2025 +0800
[CELEBORN-1972][ ][HELM] Rename affinity.{master,worker} to
{master,worker}.affinity
### What changes were proposed in this pull request?
- Rename `affinity.master` to `master.affinity`.
- Rename `affinity.worker` to `master.worker`.
### Why are the changes needed?
Unify the values naming by prefixing them with `master` or `worker`.
### Does this PR introduce _any_ user-facing change?
Yes.
### How was this patch tested?
Helm unit test by `helm unittest charts/celeborn --file
"tests/**/*_test.yaml" --strict --debug`.
Closes #3225 from ChenYi015/refactor-helm/affinity.
Authored-by: Yi Chen <[email protected]>
Signed-off-by: Shuang <[email protected]>
---
charts/celeborn/templates/master/statefulset.yaml | 8 +--
charts/celeborn/templates/worker/statefulset.yaml | 8 +--
charts/celeborn/tests/master/statefulset_test.yaml | 6 +-
charts/celeborn/tests/worker/statefulset_test.yaml | 6 +-
charts/celeborn/values.yaml | 64 +++++++++++-----------
5 files changed, 46 insertions(+), 46 deletions(-)
diff --git a/charts/celeborn/templates/master/statefulset.yaml
b/charts/celeborn/templates/master/statefulset.yaml
index 52a1ca197..92d64c9ec 100644
--- a/charts/celeborn/templates/master/statefulset.yaml
+++ b/charts/celeborn/templates/master/statefulset.yaml
@@ -126,12 +126,12 @@ spec:
nodeSelector:
{{- toYaml . | nindent 8 }}
{{- end }}
- {{- with .Values.master.tolerations }}
- tolerations:
+ {{- with .Values.master.affinity }}
+ affinity:
{{- toYaml . | nindent 8 }}
{{- end }}
- {{- with .Values.affinity.master }}
- affinity:
+ {{- with .Values.master.tolerations }}
+ tolerations:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- if or .Values.priorityClass.master.name
.Values.priorityClass.master.create }}
diff --git a/charts/celeborn/templates/worker/statefulset.yaml
b/charts/celeborn/templates/worker/statefulset.yaml
index b545c653e..59d3d4f34 100644
--- a/charts/celeborn/templates/worker/statefulset.yaml
+++ b/charts/celeborn/templates/worker/statefulset.yaml
@@ -129,12 +129,12 @@ spec:
nodeSelector:
{{- toYaml . | nindent 8 }}
{{- end }}
- {{- with .Values.worker.tolerations }}
- tolerations:
+ {{- with .Values.worker.affinity }}
+ affinity:
{{- toYaml . | nindent 8 }}
{{- end }}
- {{- with .Values.affinity.worker }}
- affinity:
+ {{- with .Values.worker.tolerations }}
+ tolerations:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- if or .Values.priorityClass.worker.name
.Values.priorityClass.worker.create }}
diff --git a/charts/celeborn/tests/master/statefulset_test.yaml
b/charts/celeborn/tests/master/statefulset_test.yaml
index a01c5a62d..5bc2d30a2 100644
--- a/charts/celeborn/tests/master/statefulset_test.yaml
+++ b/charts/celeborn/tests/master/statefulset_test.yaml
@@ -138,10 +138,10 @@ tests:
operator: Exists
effect: NoSchedule
- - it: Should use the specified affinity if `affinity.master` is set
+ - it: Should use the specified affinity if `master.affinity` is set
set:
- affinity:
- master:
+ master:
+ affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
diff --git a/charts/celeborn/tests/worker/statefulset_test.yaml
b/charts/celeborn/tests/worker/statefulset_test.yaml
index aabc23231..8973d2d19 100644
--- a/charts/celeborn/tests/worker/statefulset_test.yaml
+++ b/charts/celeborn/tests/worker/statefulset_test.yaml
@@ -138,10 +138,10 @@ tests:
operator: Exists
effect: NoSchedule
- - it: Should use the specified affinity if `affinity.worker` is specified
+ - it: Should use the specified affinity if `worker.affinity` is specified
set:
- affinity:
- worker:
+ worker:
+ affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
diff --git a/charts/celeborn/values.yaml b/charts/celeborn/values.yaml
index c96fa4361..f70918f54 100644
--- a/charts/celeborn/values.yaml
+++ b/charts/celeborn/values.yaml
@@ -187,6 +187,22 @@ master:
# key1: value1
# key2: value2
+ # -- Affinity for Celeborn master pods.
+ affinity:
+ podAntiAffinity:
+ requiredDuringSchedulingIgnoredDuringExecution:
+ - labelSelector:
+ matchExpressions:
+ - key: app.kubernetes.io/name
+ operator: In
+ values:
+ - celeborn
+ - key: app.kubernetes.io/role
+ operator: In
+ values:
+ - master
+ topologyKey: kubernetes.io/hostname
+
# -- Tolerations for Celeborn master pods.
tolerations:
# - key: key1
@@ -217,6 +233,22 @@ worker:
# key1: value1
# key2: value2
+ # -- Affinity for Celeborn worker pods.
+ affinity:
+ podAntiAffinity:
+ requiredDuringSchedulingIgnoredDuringExecution:
+ - labelSelector:
+ matchExpressions:
+ - key: app.kubernetes.io/name
+ operator: In
+ values:
+ - celeborn
+ - key: app.kubernetes.io/role
+ operator: In
+ values:
+ - worker
+ topologyKey: kubernetes.io/hostname
+
# -- Tolerations for Celeborn worker pods.
tolerations:
# - key: key1
@@ -227,38 +259,6 @@ worker:
# operator: Exists
# effect: NoSchedule
-affinity:
- # -- Pod affinity for Celeborn master pods
- master:
- podAntiAffinity:
- requiredDuringSchedulingIgnoredDuringExecution:
- - labelSelector:
- matchExpressions:
- - key: app.kubernetes.io/name
- operator: In
- values:
- - celeborn
- - key: app.kubernetes.io/role
- operator: In
- values:
- - master
- topologyKey: kubernetes.io/hostname
- # -- Pod affinity for Celeborn worker pods
- worker:
- podAntiAffinity:
- requiredDuringSchedulingIgnoredDuringExecution:
- - labelSelector:
- matchExpressions:
- - key: app.kubernetes.io/name
- operator: In
- values:
- - celeborn
- - key: app.kubernetes.io/role
- operator: In
- values:
- - worker
- topologyKey: "kubernetes.io/hostname"
-
podMonitor:
# -- Specifies whether to enable creating pod monitors for Celeborn pods
enable: true
