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 6607f35cb [CELEBORN-1393][HELM] Resource labels and selector labels
are duplicated
6607f35cb is described below
commit 6607f35cb35e28372082f2e7c2cf6281599761e1
Author: Yi Chen <[email protected]>
AuthorDate: Fri Apr 26 13:29:43 2024 +0800
[CELEBORN-1393][HELM] Resource labels and selector labels are duplicated
### What changes were proposed in this pull request?
- Add `app.kubernetes.io/name: {{ include "celeborn.name" . }}` to the
template `celeborn.selectorLabels` as this follows the Helm chart convention.
- Remove duplications in resource and selector labels.
### Why are the changes needed?
Improve helm chart.
### Does this PR introduce _any_ user-facing change?
No
### How was this patch tested?
Local test.
Closes #2470 from ChenYi015/dev.
Authored-by: Yi Chen <[email protected]>
Signed-off-by: Shuang <[email protected]>
---
charts/celeborn/templates/_helpers.tpl | 1 +
charts/celeborn/templates/configmap.yaml | 5 -----
charts/celeborn/templates/master-priorityclass.yaml | 5 -----
charts/celeborn/templates/master-service.yaml | 9 +--------
charts/celeborn/templates/master-statefulset.yaml | 17 +++--------------
charts/celeborn/templates/prometheus-podmonitor.yaml | 18 +++---------------
charts/celeborn/templates/worker-priorityclass.yaml | 5 -----
charts/celeborn/templates/worker-service.yaml | 9 +--------
charts/celeborn/templates/worker-statefulset.yaml | 17 +++--------------
9 files changed, 12 insertions(+), 74 deletions(-)
diff --git a/charts/celeborn/templates/_helpers.tpl
b/charts/celeborn/templates/_helpers.tpl
index d9245829e..893b23172 100644
--- a/charts/celeborn/templates/_helpers.tpl
+++ b/charts/celeborn/templates/_helpers.tpl
@@ -63,6 +63,7 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
Selector labels
*/}}
{{- define "celeborn.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "celeborn.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
{{- end }}
diff --git a/charts/celeborn/templates/configmap.yaml
b/charts/celeborn/templates/configmap.yaml
index db695484a..0caff4b30 100644
--- a/charts/celeborn/templates/configmap.yaml
+++ b/charts/celeborn/templates/configmap.yaml
@@ -20,11 +20,6 @@ kind: ConfigMap
metadata:
name: {{ .Release.Name }}-conf
labels:
- helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version }}
- app.kubernetes.io/name: {{ .Chart.Name }}
- app.kubernetes.io/instance: {{ .Release.Name }}
- app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
- app.kubernetes.io/managed-by: {{ .Release.Service }}
{{- include "celeborn.labels" . | nindent 4 }}
data:
celeborn-defaults.conf: |-
diff --git a/charts/celeborn/templates/master-priorityclass.yaml
b/charts/celeborn/templates/master-priorityclass.yaml
index 753fc00b9..b7608053f 100644
--- a/charts/celeborn/templates/master-priorityclass.yaml
+++ b/charts/celeborn/templates/master-priorityclass.yaml
@@ -21,11 +21,6 @@ kind: PriorityClass
metadata:
name: {{ .Values.priorityClass.master.name | default (printf
"%s-master-priority" (.Release.Name)) }}
labels:
- helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version }}
- app.kubernetes.io/name: {{ .Chart.Name }}
- app.kubernetes.io/instance: {{ .Release.Name }}
- app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
- app.kubernetes.io/managed-by: {{ .Release.Service }}
{{- include "celeborn.labels" . | nindent 4 }}
value: {{ .Values.priorityClass.master.value }}
{{- end }}
diff --git a/charts/celeborn/templates/master-service.yaml
b/charts/celeborn/templates/master-service.yaml
index 667834a0c..9d3b92f3c 100644
--- a/charts/celeborn/templates/master-service.yaml
+++ b/charts/celeborn/templates/master-service.yaml
@@ -20,11 +20,6 @@ kind: Service
metadata:
name: {{ .Release.Name }}-master-svc
labels:
- helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version }}
- app.kubernetes.io/name: {{ .Chart.Name }}
- app.kubernetes.io/instance: {{ .Release.Name }}
- app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
- app.kubernetes.io/managed-by: {{ .Release.Service }}
{{- include "celeborn.labels" . | nindent 4 }}
spec:
type: {{ .Values.service.type }}
@@ -35,7 +30,5 @@ spec:
name: celeborn-master
clusterIP: None
selector:
- app.kubernetes.io/name: {{ .Chart.Name }}
- app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
- app.kubernetes.io/role: master
{{- include "celeborn.selectorLabels" . | nindent 4 }}
+ app.kubernetes.io/role: master
diff --git a/charts/celeborn/templates/master-statefulset.yaml
b/charts/celeborn/templates/master-statefulset.yaml
index e988783f5..693587031 100644
--- a/charts/celeborn/templates/master-statefulset.yaml
+++ b/charts/celeborn/templates/master-statefulset.yaml
@@ -20,21 +20,13 @@ kind: StatefulSet
metadata:
name: {{ .Release.Name }}-master
labels:
- helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version }}
- app.kubernetes.io/name: {{ .Chart.Name }}
- app.kubernetes.io/instance: {{ .Release.Name }}
- app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
- app.kubernetes.io/managed-by: {{ .Release.Service }}
- app.kubernetes.io/role: master
{{- include "celeborn.labels" . | nindent 4 }}
+ app.kubernetes.io/role: master
spec:
selector:
matchLabels:
- app.kubernetes.io/name: {{ .Chart.Name }}
- app.kubernetes.io/instance: {{ .Release.Name }}
- app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
- app.kubernetes.io/role: master
{{- include "celeborn.selectorLabels" . | nindent 6 }}
+ app.kubernetes.io/role: master
serviceName: {{ .Release.Name }}-master-svc
replicas: {{ .Values.masterReplicas }}
template:
@@ -44,12 +36,9 @@ spec:
{{- toYaml . | nindent 8 }}
{{- end }}
labels:
- app.kubernetes.io/name: {{ .Chart.Name }}
- app.kubernetes.io/instance: {{ .Release.Name }}
- app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+ {{- include "celeborn.selectorLabels" . | nindent 8 }}
app.kubernetes.io/role: master
app.kubernetes.io/tag: {{ .Values.image.tag | quote }}
- {{- include "celeborn.selectorLabels" . | nindent 8 }}
spec:
{{- with .Values.affinity.master }}
affinity:
diff --git a/charts/celeborn/templates/prometheus-podmonitor.yaml
b/charts/celeborn/templates/prometheus-podmonitor.yaml
index bfee5ffee..f44b7eea5 100644
--- a/charts/celeborn/templates/prometheus-podmonitor.yaml
+++ b/charts/celeborn/templates/prometheus-podmonitor.yaml
@@ -22,11 +22,6 @@ kind: PodMonitor
metadata:
name: {{ .Release.Name }}-master-podmonitor
labels:
- helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version }}
- app.kubernetes.io/name: {{ .Chart.Name }}
- app.kubernetes.io/instance: {{ .Release.Name }}
- app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
- app.kubernetes.io/managed-by: {{ .Release.Service }}
{{- include "celeborn.labels" . | nindent 4 }}
spec:
podMetricsEndpoints:
@@ -40,8 +35,7 @@ spec:
- {{ .Release.Namespace }}
selector:
matchLabels:
- app.kubernetes.io/name: {{ .Chart.Name }}
- app.kubernetes.io/instance: {{ .Release.Name }}
+ {{- include "celeborn.selectorLabels" . | nindent 6 }}
app.kubernetes.io/role: master
---
apiVersion: monitoring.coreos.com/v1
@@ -49,11 +43,6 @@ kind: PodMonitor
metadata:
name: {{ .Release.Name }}-worker-podmonitor
labels:
- helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version }}
- app.kubernetes.io/name: {{ .Chart.Name }}
- app.kubernetes.io/instance: {{ .Release.Name }}
- app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
- app.kubernetes.io/managed-by: {{ .Release.Service }}
{{- include "celeborn.labels" . | nindent 4 }}
spec:
podMetricsEndpoints:
@@ -67,8 +56,7 @@ spec:
- {{ .Release.Namespace }}
selector:
matchLabels:
- app.kubernetes.io/name: {{ .Chart.Name }}
- app.kubernetes.io/instance: {{ .Release.Name }}
+ {{- include "celeborn.selectorLabels" . | nindent 6 }}
app.kubernetes.io/role: worker
-{{ end }}
+{{- end }}
{{- end }}
diff --git a/charts/celeborn/templates/worker-priorityclass.yaml
b/charts/celeborn/templates/worker-priorityclass.yaml
index 371f04628..19b587b14 100644
--- a/charts/celeborn/templates/worker-priorityclass.yaml
+++ b/charts/celeborn/templates/worker-priorityclass.yaml
@@ -21,11 +21,6 @@ kind: PriorityClass
metadata:
name: {{ .Values.priorityClass.worker.name | default (printf
"%s-worker-priority" (.Release.Name)) }}
labels:
- helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version }}
- app.kubernetes.io/name: {{ .Chart.Name }}
- app.kubernetes.io/instance: {{ .Release.Name }}
- app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
- app.kubernetes.io/managed-by: {{ .Release.Service }}
{{- include "celeborn.labels" . | nindent 4 }}
value: {{ .Values.priorityClass.worker.value }}
{{- end }}
diff --git a/charts/celeborn/templates/worker-service.yaml
b/charts/celeborn/templates/worker-service.yaml
index 6b47b958f..2bf8efbef 100644
--- a/charts/celeborn/templates/worker-service.yaml
+++ b/charts/celeborn/templates/worker-service.yaml
@@ -20,17 +20,10 @@ kind: Service
metadata:
name: {{ .Release.Name }}-worker-svc
labels:
- helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version }}
- app.kubernetes.io/name: {{ .Chart.Name }}
- app.kubernetes.io/instance: {{ .Release.Name }}
- app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
- app.kubernetes.io/managed-by: {{ .Release.Service }}
{{- include "celeborn.labels" . | nindent 4 }}
spec:
type: {{ .Values.service.type }}
clusterIP: None
selector:
- app.kubernetes.io/name: {{ .Chart.Name }}
- app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
- app.kubernetes.io/role: worker
{{- include "celeborn.selectorLabels" . | nindent 4 }}
+ app.kubernetes.io/role: worker
diff --git a/charts/celeborn/templates/worker-statefulset.yaml
b/charts/celeborn/templates/worker-statefulset.yaml
index a9a003adc..f4ad1c979 100644
--- a/charts/celeborn/templates/worker-statefulset.yaml
+++ b/charts/celeborn/templates/worker-statefulset.yaml
@@ -20,21 +20,13 @@ kind: StatefulSet
metadata:
name: {{ .Release.Name }}-worker
labels:
- helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version }}
- app.kubernetes.io/name: {{ .Chart.Name }}
- app.kubernetes.io/instance: {{ .Release.Name }}
- app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
- app.kubernetes.io/managed-by: {{ .Release.Service }}
- app.kubernetes.io/role: worker
{{- include "celeborn.labels" . | nindent 4 }}
+ app.kubernetes.io/role: worker
spec:
selector:
matchLabels:
- app.kubernetes.io/name: {{ .Chart.Name }}
- app.kubernetes.io/instance: {{ .Release.Name }}
- app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
- app.kubernetes.io/role: worker
{{- include "celeborn.selectorLabels" . | nindent 6 }}
+ app.kubernetes.io/role: worker
serviceName: {{ .Release.Name }}-worker
replicas: {{ .Values.workerReplicas }}
template:
@@ -44,12 +36,9 @@ spec:
{{- toYaml . | nindent 8 }}
{{- end }}
labels:
- app.kubernetes.io/name: {{ .Chart.Name }}
- app.kubernetes.io/instance: {{ .Release.Name }}
- app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+ {{- include "celeborn.selectorLabels" . | nindent 8 }}
app.kubernetes.io/role: worker
app.kubernetes.io/tag: {{ .Values.image.tag | quote }}
- {{- include "celeborn.selectorLabels" . | nindent 8 }}
spec:
{{- with .Values.affinity.worker }}
affinity:
