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/incubator-celeborn.git
The following commit(s) were added to refs/heads/main by this push:
new fb915448 [CELEBORN-210][HELM] Add recommended labels in celeborn chart
(#1156)
fb915448 is described below
commit fb91544843c93c07508e815160ba5f6d4f354932
Author: Binjie Yang <[email protected]>
AuthorDate: Tue Jan 10 19:18:14 2023 +0800
[CELEBORN-210][HELM] Add recommended labels in celeborn chart (#1156)
* [HELM] Add recommended labels in celeborn chart
* fix master and worker affinity
---
docker/helm/templates/configmap.yaml | 5 +++++
docker/helm/templates/master-service.yaml | 10 ++++++++--
docker/helm/templates/master-statefulset.yaml | 14 +++++++++++---
docker/helm/templates/prometheus-podmonitor.yaml | 14 ++++++++++++++
docker/helm/templates/worker-service.yaml | 10 ++++++++--
docker/helm/templates/worker-statefulset.yaml | 14 +++++++++++---
docker/helm/values.yaml | 12 ++++++++++--
7 files changed, 67 insertions(+), 12 deletions(-)
diff --git a/docker/helm/templates/configmap.yaml
b/docker/helm/templates/configmap.yaml
index 7a6a5bac..66989917 100644
--- a/docker/helm/templates/configmap.yaml
+++ b/docker/helm/templates/configmap.yaml
@@ -20,6 +20,11 @@ kind: ConfigMap
metadata:
name: celeborn-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: {{ .Values.image.tag | default
.Chart.AppVersion | quote }}
+ app.kubernetes.io/managed-by: {{ .Release.Service }}
{{- include "celeborn.labels" . | nindent 4 }}
data:
celeborn-defaults.conf: |-
diff --git a/docker/helm/templates/master-service.yaml
b/docker/helm/templates/master-service.yaml
index 3e40ba60..bc66f89e 100644
--- a/docker/helm/templates/master-service.yaml
+++ b/docker/helm/templates/master-service.yaml
@@ -20,6 +20,11 @@ kind: Service
metadata:
name: celeborn-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: {{ .Values.image.tag | default
.Chart.AppVersion | quote }}
+ app.kubernetes.io/managed-by: {{ .Release.Service }}
{{- include "celeborn.labels" . | nindent 4 }}
spec:
type: {{ .Values.service.type }}
@@ -30,6 +35,7 @@ spec:
name: celeborn-master
clusterIP: None
selector:
- {{- include "celeborn.selectorLabels" . | nindent 4 }}
- app.kubernetes.io/name: celeborn-master
+ app.kubernetes.io/name: {{ .Chart.Name }}
+ app.kubernetes.io/version: {{ .Values.image.tag | default
.Chart.AppVersion | quote }}
app.kubernetes.io/role: master
+ {{- include "celeborn.selectorLabels" . | nindent 4 }}
diff --git a/docker/helm/templates/master-statefulset.yaml
b/docker/helm/templates/master-statefulset.yaml
index 83de610a..2531fe75 100644
--- a/docker/helm/templates/master-statefulset.yaml
+++ b/docker/helm/templates/master-statefulset.yaml
@@ -20,13 +20,19 @@ kind: StatefulSet
metadata:
name: celeborn-master
labels:
- app.kubernetes.io/name: celeborn-master
+ helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version }}
+ app.kubernetes.io/name: {{ .Chart.Name }}
+ app.kubernetes.io/instance: {{ .Release.Name }}
+ app.kubernetes.io/version: {{ .Values.image.tag | default
.Chart.AppVersion | quote }}
+ app.kubernetes.io/managed-by: {{ .Release.Service }}
app.kubernetes.io/role: master
{{- include "celeborn.labels" . | nindent 4 }}
spec:
selector:
matchLabels:
- app.kubernetes.io/name: celeborn-master
+ app.kubernetes.io/name: {{ .Chart.Name }}
+ app.kubernetes.io/instance: { { .Release.Name } }
+ app.kubernetes.io/version: {{ .Values.image.tag | default
.Chart.AppVersion | quote }}
app.kubernetes.io/role: master
{{- include "celeborn.selectorLabels" . | nindent 6 }}
serviceName: celeborn-master-svc
@@ -38,7 +44,9 @@ spec:
{{- toYaml . | nindent 8 }}
{{- end }}
labels:
- app.kubernetes.io/name: celeborn-master
+ app.kubernetes.io/name: {{ .Chart.Name }}
+ app.kubernetes.io/instance: { { .Release.Name } }
+ app.kubernetes.io/version: {{ .Values.image.tag | default
.Chart.AppVersion | quote }}
app.kubernetes.io/role: master
{{- include "celeborn.selectorLabels" . | nindent 8 }}
spec:
diff --git a/docker/helm/templates/prometheus-podmonitor.yaml
b/docker/helm/templates/prometheus-podmonitor.yaml
index ed8c40c0..d0339bc7 100644
--- a/docker/helm/templates/prometheus-podmonitor.yaml
+++ b/docker/helm/templates/prometheus-podmonitor.yaml
@@ -21,6 +21,13 @@ apiVersion: monitoring.coreos.com/v1
kind: PodMonitor
metadata:
name: celeborn-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: {{ .Values.image.tag | default
.Chart.AppVersion | quote }}
+ app.kubernetes.io/managed-by: {{ .Release.Service }}
+ {{ - include "celeborn.labels" . | nindent 4 }}
spec:
podMetricsEndpoints:
- interval: {{ .Values.podMonitor.podMetricsEndpoint.interval }}
@@ -39,6 +46,13 @@ apiVersion: monitoring.coreos.com/v1
kind: PodMonitor
metadata:
name: celeborn-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: {{ .Values.image.tag | default
.Chart.AppVersion | quote }}
+ app.kubernetes.io/managed-by: {{ .Release.Service }}
+ {{ - include "celeborn.labels" . | nindent 4 }}
spec:
podMetricsEndpoints:
- interval: {{ .Values.podMonitor.podMetricsEndpoint.interval }}
diff --git a/docker/helm/templates/worker-service.yaml
b/docker/helm/templates/worker-service.yaml
index 5b1f0c38..0daa01ab 100644
--- a/docker/helm/templates/worker-service.yaml
+++ b/docker/helm/templates/worker-service.yaml
@@ -20,11 +20,17 @@ kind: Service
metadata:
name: celeborn-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: {{ .Values.image.tag | default
.Chart.AppVersion | quote }}
+ app.kubernetes.io/managed-by: {{ .Release.Service }}
{{- include "celeborn.labels" . | nindent 4 }}
spec:
type: {{ .Values.service.type }}
clusterIP: None
selector:
- {{- include "celeborn.selectorLabels" . | nindent 4 }}
- app.kubernetes.io/name: celeborn-worker
+ app.kubernetes.io/name: {{ .Chart.Name }}
+ app.kubernetes.io/version: {{ .Values.image.tag | default
.Chart.AppVersion | quote }}
app.kubernetes.io/role: worker
+ {{- include "celeborn.selectorLabels" . | nindent 4 }}
diff --git a/docker/helm/templates/worker-statefulset.yaml
b/docker/helm/templates/worker-statefulset.yaml
index 4b407880..b11d5ca2 100644
--- a/docker/helm/templates/worker-statefulset.yaml
+++ b/docker/helm/templates/worker-statefulset.yaml
@@ -20,13 +20,19 @@ kind: StatefulSet
metadata:
name: celeborn-worker
labels:
- app.kubernetes.io/name: celeborn-worker
+ helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version }}
+ app.kubernetes.io/name: {{ .Chart.Name }}
+ app.kubernetes.io/instance: {{ .Release.Name }}
+ app.kubernetes.io/version: {{ .Values.image.tag | default
.Chart.AppVersion | quote }}
+ app.kubernetes.io/managed-by: {{ .Release.Service }}
app.kubernetes.io/role: worker
{{- include "celeborn.labels" . | nindent 4 }}
spec:
selector:
matchLabels:
- app.kubernetes.io/name: celeborn-worker
+ app.kubernetes.io/name: {{ .Chart.Name }}
+ app.kubernetes.io/instance: {{ .Release.Name }}
+ app.kubernetes.io/version: {{ .Values.image.tag | default
.Chart.AppVersion | quote }}
app.kubernetes.io/role: worker
{{- include "celeborn.selectorLabels" . | nindent 6 }}
serviceName: celeborn-worker
@@ -38,7 +44,9 @@ spec:
{{- toYaml . | nindent 8 }}
{{- end }}
labels:
- app.kubernetes.io/name: celeborn-worker
+ app.kubernetes.io/name: {{ .Chart.Name }}
+ app.kubernetes.io/instance: {{ .Release.Name }}
+ app.kubernetes.io/version: {{ .Values.image.tag | default
.Chart.AppVersion | quote }}
app.kubernetes.io/role: worker
{{- include "celeborn.selectorLabels" . | nindent 8 }}
spec:
diff --git a/docker/helm/values.yaml b/docker/helm/values.yaml
index 33323512..f73ee706 100644
--- a/docker/helm/values.yaml
+++ b/docker/helm/values.yaml
@@ -112,7 +112,11 @@ affinity:
- key: app.kubernetes.io/name
operator: In
values:
- - celeborn-master
+ - celeborn
+ - key: app.kubernetes.io/role
+ operator: In
+ values:
+ - master
topologyKey: kubernetes.io/hostname
worker:
podAntiAffinity:
@@ -122,7 +126,11 @@ affinity:
- key: app.kubernetes.io/name
operator: In
values:
- - celeborn-worker
+ - celeborn
+ - key: app.kubernetes.io/role
+ operator: In
+ values:
+ - worker
topologyKey: "kubernetes.io/hostname"
tolerations: []
