This is an automated email from the ASF dual-hosted git repository.
chengpan 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 3db997496 [CELEBORN-1986][HELM] Rename priorityClass.{master,worker}
to {master,worker}.priorityClass
3db997496 is described below
commit 3db99749608b21574eef649e73dcef4d6bd5aa5e
Author: Yi Chen <[email protected]>
AuthorDate: Mon Apr 28 16:05:26 2025 +0800
[CELEBORN-1986][HELM] Rename priorityClass.{master,worker} to
{master,worker}.priorityClass
### What changes were proposed in this pull request?
- Rename `priorityClass.master` to `master.priorityClass`
- Rename `priorityClass.worker` to `worker.priorityClass`
### 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?
Run Helm unit tests by `helm unittest charts/celeborn --file
"tests/**/*_test.yaml" --strict --debug`.
Closes #3234 from ChenYi015/helm/priority-class.
Authored-by: Yi Chen <[email protected]>
Signed-off-by: Cheng Pan <[email protected]>
---
charts/celeborn/templates/master/_helpers.tpl | 4 +--
.../celeborn/templates/master/priorityclass.yaml | 4 +--
charts/celeborn/templates/master/statefulset.yaml | 2 +-
charts/celeborn/templates/worker/_helpers.tpl | 4 +--
.../celeborn/templates/worker/priorityclass.yaml | 4 +--
charts/celeborn/templates/worker/statefulset.yaml | 2 +-
.../celeborn/tests/master/priorityclass_test.yaml | 10 +++---
charts/celeborn/tests/master/statefulset_test.yaml | 6 ++--
.../celeborn/tests/worker/priorityclass_test.yaml | 10 +++---
charts/celeborn/tests/worker/statefulset_test.yaml | 6 ++--
charts/celeborn/values.yaml | 37 +++++++++++-----------
11 files changed, 44 insertions(+), 45 deletions(-)
diff --git a/charts/celeborn/templates/master/_helpers.tpl
b/charts/celeborn/templates/master/_helpers.tpl
index e2ad66d4a..098ec6e16 100644
--- a/charts/celeborn/templates/master/_helpers.tpl
+++ b/charts/celeborn/templates/master/_helpers.tpl
@@ -16,7 +16,7 @@ limitations under the License.
*/}}
{{/*
-Common labels for Celeborn master resoruces
+Common labels for Celeborn master resources
*/}}
{{- define "celeborn.master.labels" -}}
{{ include "celeborn.labels" . }}
@@ -43,7 +43,7 @@ Create the name of the master service to use
Create the name of the master priority class to use
*/}}
{{- define "celeborn.master.priorityClass.name" -}}
-{{- with .Values.priorityClass.master.name -}}
+{{- with .Values.master.priorityClass.name -}}
{{ . }}
{{- else -}}
{{ include "celeborn.fullname" . }}-master-priority-class
diff --git a/charts/celeborn/templates/master/priorityclass.yaml
b/charts/celeborn/templates/master/priorityclass.yaml
index 32b6323a5..f8cc847ce 100644
--- a/charts/celeborn/templates/master/priorityclass.yaml
+++ b/charts/celeborn/templates/master/priorityclass.yaml
@@ -15,12 +15,12 @@ See the License for the specific language governing
permissions and
limitations under the License.
*/ -}}
-{{- if .Values.priorityClass.master.create }}
+{{- if .Values.master.priorityClass.create }}
apiVersion: scheduling.k8s.io/v1
kind: PriorityClass
metadata:
name: {{ include "celeborn.master.priorityClass.name" . }}
labels:
{{- include "celeborn.master.labels" . | nindent 4 }}
-value: {{ .Values.priorityClass.master.value }}
+value: {{ .Values.master.priorityClass.value }}
{{- end }}
diff --git a/charts/celeborn/templates/master/statefulset.yaml
b/charts/celeborn/templates/master/statefulset.yaml
index d48fd030a..96835392d 100644
--- a/charts/celeborn/templates/master/statefulset.yaml
+++ b/charts/celeborn/templates/master/statefulset.yaml
@@ -133,7 +133,7 @@ spec:
tolerations:
{{- toYaml . | nindent 8 }}
{{- end }}
- {{- if or .Values.priorityClass.master.name
.Values.priorityClass.master.create }}
+ {{- if or .Values.master.priorityClass.name
.Values.master.priorityClass.create }}
priorityClassName: {{ include "celeborn.master.priorityClass.name" . }}
{{- end }}
{{- with .Values.dnsPolicy }}
diff --git a/charts/celeborn/templates/worker/_helpers.tpl
b/charts/celeborn/templates/worker/_helpers.tpl
index f960ac0c2..c135972ef 100644
--- a/charts/celeborn/templates/worker/_helpers.tpl
+++ b/charts/celeborn/templates/worker/_helpers.tpl
@@ -16,7 +16,7 @@ limitations under the License.
*/}}
{{/*
-Common labels for Celeborn master resoruces
+Common labels for Celeborn master resources
*/}}
{{- define "celeborn.worker.labels" -}}
{{ include "celeborn.labels" . }}
@@ -65,7 +65,7 @@ ports:
Create the name of the worker priority class to use
*/}}
{{- define "celeborn.worker.priorityClass.name" -}}
-{{- with .Values.priorityClass.worker.name -}}
+{{- with .Values.worker.priorityClass.name -}}
{{ . }}
{{- else -}}
{{ include "celeborn.fullname" . }}-worker-priority-class
diff --git a/charts/celeborn/templates/worker/priorityclass.yaml
b/charts/celeborn/templates/worker/priorityclass.yaml
index ce9367576..95a55b653 100644
--- a/charts/celeborn/templates/worker/priorityclass.yaml
+++ b/charts/celeborn/templates/worker/priorityclass.yaml
@@ -15,12 +15,12 @@ See the License for the specific language governing
permissions and
limitations under the License.
*/ -}}
-{{- if .Values.priorityClass.worker.create }}
+{{- if .Values.worker.priorityClass.create }}
apiVersion: scheduling.k8s.io/v1
kind: PriorityClass
metadata:
name: {{ include "celeborn.worker.priorityClass.name" . }}
labels:
{{- include "celeborn.worker.labels" . | nindent 4 }}
-value: {{ .Values.priorityClass.worker.value }}
+value: {{ .Values.worker.priorityClass.value }}
{{- end }}
diff --git a/charts/celeborn/templates/worker/statefulset.yaml
b/charts/celeborn/templates/worker/statefulset.yaml
index 737f1a99e..9b7db194b 100644
--- a/charts/celeborn/templates/worker/statefulset.yaml
+++ b/charts/celeborn/templates/worker/statefulset.yaml
@@ -136,7 +136,7 @@ spec:
tolerations:
{{- toYaml . | nindent 8 }}
{{- end }}
- {{- if or .Values.priorityClass.worker.name
.Values.priorityClass.worker.create }}
+ {{- if or .Values.worker.priorityClass.name
.Values.worker.priorityClass.create }}
priorityClassName: {{ include "celeborn.worker.priorityClass.name" . }}
{{- end }}
{{- with .Values.dnsPolicy }}
diff --git a/charts/celeborn/tests/master/priorityclass_test.yaml
b/charts/celeborn/tests/master/priorityclass_test.yaml
index 22afcf0db..5ca7d1314 100644
--- a/charts/celeborn/tests/master/priorityclass_test.yaml
+++ b/charts/celeborn/tests/master/priorityclass_test.yaml
@@ -29,10 +29,10 @@ tests:
- hasDocuments:
count: 0
- - it: Should create master priority class if `priorityClass.master.create`
is true
+ - it: Should create master priority class if `master.priorityClass.create`
is true
set:
- priorityClass:
- master:
+ master:
+ priorityClass:
create: true
asserts:
- containsDocument:
@@ -42,8 +42,8 @@ tests:
- it: Should use the specified priority class value
set:
- priorityClass:
- master:
+ master:
+ priorityClass:
create: true
value: 1000
asserts:
diff --git a/charts/celeborn/tests/master/statefulset_test.yaml
b/charts/celeborn/tests/master/statefulset_test.yaml
index 09fd89661..41833ef5e 100644
--- a/charts/celeborn/tests/master/statefulset_test.yaml
+++ b/charts/celeborn/tests/master/statefulset_test.yaml
@@ -223,10 +223,10 @@ tests:
values:
- another-node-label-value
- - it: Should use the specified priority class name if
`priorityClass.master.name` is set
+ - it: Should use the specified priority class name if
`master.priorityClass.name` is set
set:
- priorityClass:
- master:
+ master:
+ priorityClass:
name: test-priority-class
asserts:
- equal:
diff --git a/charts/celeborn/tests/worker/priorityclass_test.yaml
b/charts/celeborn/tests/worker/priorityclass_test.yaml
index 6e9362e38..55389c4e3 100644
--- a/charts/celeborn/tests/worker/priorityclass_test.yaml
+++ b/charts/celeborn/tests/worker/priorityclass_test.yaml
@@ -29,10 +29,10 @@ tests:
- hasDocuments:
count: 0
- - it: Should create worker priority class if `priorityClass.worker.create`
is true
+ - it: Should create worker priority class if `worker.priorityClass.create`
is true
set:
- priorityClass:
- worker:
+ worker:
+ priorityClass:
create: true
asserts:
- containsDocument:
@@ -42,8 +42,8 @@ tests:
- it: Should use the specified priority class value
set:
- priorityClass:
- worker:
+ worker:
+ priorityClass:
create: true
value: 1000
asserts:
diff --git a/charts/celeborn/tests/worker/statefulset_test.yaml
b/charts/celeborn/tests/worker/statefulset_test.yaml
index b6e651b10..1030f374b 100644
--- a/charts/celeborn/tests/worker/statefulset_test.yaml
+++ b/charts/celeborn/tests/worker/statefulset_test.yaml
@@ -223,10 +223,10 @@ tests:
values:
- another-node-label-value
- - it: Should use the specified priority class name if
`priorityClass.worker.name` is set
+ - it: Should use the specified priority class name if
`worker.priorityClass.name` is set
set:
- priorityClass:
- worker:
+ worker:
+ priorityClass:
name: test-priority-class
asserts:
- equal:
diff --git a/charts/celeborn/values.yaml b/charts/celeborn/values.yaml
index cb191056e..61f69c0d6 100644
--- a/charts/celeborn/values.yaml
+++ b/charts/celeborn/values.yaml
@@ -138,25 +138,6 @@ securityContext:
# Specifies the group ID to use when modifying ownership and permissions of
the mounted volumes
fsGroup: 10006
-priorityClass:
- # Priority class for Celeborn master pods
- master:
- # -- Specifies whether a new priority class for Celeborn master pods
should be created
- create: false
- # -- Specifies the name of priority class for Celeborn master pods to be
used (created if `create: true`), empty means
`${Release.Name}-master-priority-class`
- name: ""
- # -- Specifies the integer value of this priority class, default is half
of system-cluster-critical
- value: 1000000000
-
- # Priority class for Celeborn worker pods
- worker:
- # -- Specifies whether a new priority class for Celeborn worker pods
should be created
- create: false
- # -- Specifies the name of priority class for Celeborn worker pods to be
used (created if `create: true`), empty means
`${Release.Name}-worker-priority-class`
- name: ""
- # -- Specifies the integer value of this priority class, default is
Celeborn master value minus 1000
- value: 999999000
-
master:
# -- Annotations for Celeborn master pods.
annotations:
@@ -214,6 +195,15 @@ master:
# operator: Exists
# effect: NoSchedule
+ # Priority class for Celeborn master pods.
+ priorityClass:
+ # -- Specifies whether a new priority class for Celeborn master pods
should be created.
+ create: false
+ # -- Specifies the name of priority class for Celeborn master pods to be
used (created if `create: true`), empty means
`${Release.Name}-master-priority-class`.
+ name: ""
+ # -- Specifies the integer value of this priority class, default is half
of system-cluster-critical.
+ value: 1000000000
+
worker:
# -- Annotations for Celeborn worker pods.
annotations:
@@ -273,6 +263,15 @@ worker:
# operator: Exists
# effect: NoSchedule
+ # Priority class for Celeborn worker pods.
+ priorityClass:
+ # -- Specifies whether a new priority class for Celeborn worker pods
should be created
+ create: false
+ # -- Specifies the name of priority class for Celeborn worker pods to be
used (created if `create: true`), empty means
`${Release.Name}-worker-priority-class`
+ name: ""
+ # -- Specifies the integer value of this priority class, default is
Celeborn master value minus 1000
+ value: 999999000
+
podMonitor:
# -- Specifies whether to enable creating pod monitors for Celeborn pods
enable: true
