From 9014e083f09f5ac147a97799ae9a25566a4cbc91 Mon Sep 17 00:00:00 2001
From: zwangsheng <2213335496@qq.com>
Date: Thu, 10 Aug 2023 14:53:00 +0800
Subject: [PATCH 1/5] [CELEBORN-886][HELM]Support multiple celeborn clusters in
 the same k8s namespace

---
 charts/celeborn/templates/configmap.yaml             |  6 +++---
 charts/celeborn/templates/master-service.yaml        |  2 +-
 charts/celeborn/templates/master-statefulset.yaml    |  8 ++++----
 charts/celeborn/templates/prometheus-podmonitor.yaml | 10 ++++++++--
 charts/celeborn/templates/worker-service.yaml        |  2 +-
 charts/celeborn/templates/worker-statefulset.yaml    |  8 ++++----
 charts/celeborn/values.yaml                          |  2 ++
 7 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/charts/celeborn/templates/configmap.yaml b/charts/celeborn/templates/configmap.yaml
index 849dcbcbcfa..2f0e0d80f63 100644
--- a/charts/celeborn/templates/configmap.yaml
+++ b/charts/celeborn/templates/configmap.yaml
@@ -18,7 +18,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: celeborn-conf
+  name: {{ .Values.celebornClusterPrefix }}-conf
   labels:
     helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version }}
     app.kubernetes.io/name: {{ .Chart.Name }}
@@ -29,9 +29,9 @@ metadata:
 data:
   celeborn-defaults.conf: |-
     {{- $namespace := .Release.Namespace }}
-    celeborn.master.endpoints={{ range until (.Values.masterReplicas |int) }}celeborn-master-{{ . }}.celeborn-master-svc.{{ $namespace }}.svc.{{ $.Values.cluster.name }}.local,{{ end }}
+    celeborn.master.endpoints={{ range until (.Values.masterReplicas |int) }}{{ $.Values.celebornClusterPrefix }}-master-{{ . }}.{{ $.Values.celebornClusterPrefix }}-master-svc.{{ $namespace }}.svc.{{ $.Values.cluster.name }}.local,{{ end }}
     {{- range until (.Values.masterReplicas |int) }}
-    celeborn.master.ha.node.{{ . }}.host=celeborn-master-{{ . }}.celeborn-master-svc.{{ $namespace }}.svc.{{ $.Values.cluster.name }}.local
+    celeborn.master.ha.node.{{ . }}.host={{ $.Values.celebornClusterPrefix }}-master-{{ . }}.{{ $.Values.celebornClusterPrefix }}-master-svc.{{ $namespace }}.svc.{{ $.Values.cluster.name }}.local
     {{- end }}
     {{- $dirs := .Values.volumes.master }}
     celeborn.master.ha.ratis.raft.server.storage.dir={{ (index $dirs 0).mountPath }}
diff --git a/charts/celeborn/templates/master-service.yaml b/charts/celeborn/templates/master-service.yaml
index 09e0bc12b72..5e119531c05 100644
--- a/charts/celeborn/templates/master-service.yaml
+++ b/charts/celeborn/templates/master-service.yaml
@@ -18,7 +18,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: celeborn-master-svc
+  name: {{ .Values.celebornClusterPrefix }}-master-svc
   labels:
     helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version }}
     app.kubernetes.io/name: {{ .Chart.Name }}
diff --git a/charts/celeborn/templates/master-statefulset.yaml b/charts/celeborn/templates/master-statefulset.yaml
index be25769fcdf..1cebc8b07e2 100644
--- a/charts/celeborn/templates/master-statefulset.yaml
+++ b/charts/celeborn/templates/master-statefulset.yaml
@@ -18,7 +18,7 @@
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
-  name: celeborn-master
+  name: {{ .Values.celebornClusterPrefix }}-master
   labels:
     helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version }}
     app.kubernetes.io/name: {{ .Chart.Name }}
@@ -35,7 +35,7 @@ spec:
       app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
       app.kubernetes.io/role: master
       {{- include "celeborn.selectorLabels" . | nindent 6 }}
-  serviceName: celeborn-master-svc
+  serviceName: {{ .Values.celebornClusterPrefix }}-master-svc
   replicas: {{ .Values.masterReplicas }}
   template:
     metadata:
@@ -99,7 +99,7 @@ spec:
           - "/bin/sh"
           - '-c'
           {{- $namespace := .Release.Namespace }}
-          - "until {{ range until (.Values.masterReplicas |int) }}nslookup celeborn-master-{{ . }}.celeborn-master-svc.{{ $namespace }}.svc.{{ $.Values.cluster.name }}.local && {{ end }}true; do echo waiting for master; sleep 2; done && exec /opt/celeborn/sbin/start-master.sh"
+          - "until {{ range until (.Values.masterReplicas |int) }}nslookup {{ $.Values.celebornClusterPrefix }}-master-{{ . }}.{{ $.Values.celebornClusterPrefix }}-master-svc.{{ $namespace }}.svc.{{ $.Values.cluster.name }}.local && {{ end }}true; do echo waiting for master; sleep 2; done && exec /opt/celeborn/sbin/start-master.sh"
         resources:
           {{- toYaml .Values.resources.master | nindent 12 }}
         ports:
@@ -123,7 +123,7 @@ spec:
       terminationGracePeriodSeconds: 30 
       volumes:
         - configMap:
-            name: {{ .Values.configmap }}
+            name: {{ .Values.celebornClusterPrefix }}-conf
           name: {{ include "celeborn.fullname" . }}-volume
         {{- range $index, $volume := .Values.volumes.master }}
         - name: celeborn-master-vol-{{ $index }}
diff --git a/charts/celeborn/templates/prometheus-podmonitor.yaml b/charts/celeborn/templates/prometheus-podmonitor.yaml
index 0683ac9e8e4..241c30d0d06 100644
--- a/charts/celeborn/templates/prometheus-podmonitor.yaml
+++ b/charts/celeborn/templates/prometheus-podmonitor.yaml
@@ -20,7 +20,7 @@
 apiVersion: monitoring.coreos.com/v1
 kind: PodMonitor
 metadata:
-  name: celeborn-master-podmonitor
+  name: {{ .Values.celebornClusterPrefix }}-master-podmonitor
   labels:
     helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version }}
     app.kubernetes.io/name: {{ .Chart.Name }}
@@ -40,12 +40,15 @@ spec:
       - {{ .Release.Namespace }}
   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
 ---
 apiVersion: monitoring.coreos.com/v1
 kind: PodMonitor
 metadata:
-  name: celeborn-worker-podmonitor
+  name: {{ .Values.celebornClusterPrefix }}-worker-podmonitor
   labels:
     helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version }}
     app.kubernetes.io/name: {{ .Chart.Name }}
@@ -65,6 +68,9 @@ spec:
       - {{ .Release.Namespace }}
   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
 {{ end }}
 {{- end }}
diff --git a/charts/celeborn/templates/worker-service.yaml b/charts/celeborn/templates/worker-service.yaml
index d1daaae07ff..061556a7db6 100644
--- a/charts/celeborn/templates/worker-service.yaml
+++ b/charts/celeborn/templates/worker-service.yaml
@@ -18,7 +18,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: celeborn-worker-svc
+  name: {{ .Values.celebornClusterPrefix }}-worker-svc
   labels:
     helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version }}
     app.kubernetes.io/name: {{ .Chart.Name }}
diff --git a/charts/celeborn/templates/worker-statefulset.yaml b/charts/celeborn/templates/worker-statefulset.yaml
index 0a4ab5756f3..55794c682d9 100644
--- a/charts/celeborn/templates/worker-statefulset.yaml
+++ b/charts/celeborn/templates/worker-statefulset.yaml
@@ -18,7 +18,7 @@
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
-  name: celeborn-worker
+  name: {{ .Values.celebornClusterPrefix }}-worker
   labels:
     helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version }}
     app.kubernetes.io/name: {{ .Chart.Name }}
@@ -35,7 +35,7 @@ spec:
       app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
       app.kubernetes.io/role: worker
       {{- include "celeborn.selectorLabels" . | nindent 6 }}
-  serviceName: celeborn-worker
+  serviceName: {{ .Values.celebornClusterPrefix }}-worker
   replicas: {{ .Values.workerReplicas }}
   template:
     metadata:
@@ -103,7 +103,7 @@ spec:
           - "/bin/sh"
           - '-c'
           {{- $namespace := .Release.Namespace }}
-          - "until {{ range until (.Values.masterReplicas |int) }}nslookup celeborn-master-{{ . }}.celeborn-master-svc.{{ $namespace }}.svc.{{ $.Values.cluster.name }}.local && {{ end }}true; do echo waiting for master; sleep 2; done && exec /opt/celeborn/sbin/start-worker.sh"
+          - "until {{ range until (.Values.masterReplicas |int) }}nslookup {{ $.Values.celebornClusterPrefix }}-master-{{ . }}.{{ $.Values.celebornClusterPrefix }}-master-svc.{{ $namespace }}.svc.{{ $.Values.cluster.name }}.local && {{ end }}true; do echo waiting for master; sleep 2; done && exec /opt/celeborn/sbin/start-worker.sh"
         resources:
           {{- toYaml .Values.resources.worker | nindent 12 }}
         ports:
@@ -128,7 +128,7 @@ spec:
       terminationGracePeriodSeconds: 30
       volumes:
         - configMap:
-            name: {{ .Values.configmap }}
+            name: {{ .Values.celebornClusterPrefix }}-conf
           name: {{ include "celeborn.fullname" . }}-volume
         {{- range $index, $volume := .Values.volumes.worker }}
         {{- if eq "emptyDir" $volume.type }}
diff --git a/charts/celeborn/values.yaml b/charts/celeborn/values.yaml
index 08bbdc89894..bc71bebda5d 100644
--- a/charts/celeborn/values.yaml
+++ b/charts/celeborn/values.yaml
@@ -32,6 +32,8 @@ imagePullSecrets: {}
 masterReplicas: 3
 # worker replicas set on demand, should less than node number
 workerReplicas: 5
+# celeborn resources' name prefix
+celebornClusterPrefix: celeborn
 
 hostNetwork: false
 dnsPolicy: ClusterFirst

From 398468a01a56b788eeff5f1e376700f9b7be56d9 Mon Sep 17 00:00:00 2001
From: zwangsheng <2213335496@qq.com>
Date: Thu, 10 Aug 2023 14:55:49 +0800
Subject: [PATCH 2/5] remove un-used var

---
 charts/celeborn/values.yaml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/charts/celeborn/values.yaml b/charts/celeborn/values.yaml
index bc71bebda5d..657b5405d05 100644
--- a/charts/celeborn/values.yaml
+++ b/charts/celeborn/values.yaml
@@ -120,8 +120,6 @@ service:
 cluster:
   name: cluster
 
-configmap: celeborn-conf
-
 resources: {}
   # We usually recommend not to specify default resources and to leave this as a conscious
   # choice for the user. This also increases chances charts run on environments with little

From 8f73fb55f9dfab7dfc33554468b6c7cd5e3c899d Mon Sep 17 00:00:00 2001
From: zwangsheng <2213335496@qq.com>
Date: Mon, 14 Aug 2023 15:17:14 +0800
Subject: [PATCH 3/5] Using .Release.Name instead

---
 charts/celeborn/templates/configmap.yaml             | 6 +++---
 charts/celeborn/templates/master-service.yaml        | 2 +-
 charts/celeborn/templates/master-statefulset.yaml    | 8 ++++----
 charts/celeborn/templates/prometheus-podmonitor.yaml | 4 ++--
 charts/celeborn/templates/worker-service.yaml        | 2 +-
 charts/celeborn/templates/worker-statefulset.yaml    | 8 ++++----
 charts/celeborn/values.yaml                          | 2 --
 7 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/charts/celeborn/templates/configmap.yaml b/charts/celeborn/templates/configmap.yaml
index 2f0e0d80f63..546d41114f3 100644
--- a/charts/celeborn/templates/configmap.yaml
+++ b/charts/celeborn/templates/configmap.yaml
@@ -18,7 +18,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ .Values.celebornClusterPrefix }}-conf
+  name: {{ .Release.Name }}-conf
   labels:
     helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version }}
     app.kubernetes.io/name: {{ .Chart.Name }}
@@ -29,9 +29,9 @@ metadata:
 data:
   celeborn-defaults.conf: |-
     {{- $namespace := .Release.Namespace }}
-    celeborn.master.endpoints={{ range until (.Values.masterReplicas |int) }}{{ $.Values.celebornClusterPrefix }}-master-{{ . }}.{{ $.Values.celebornClusterPrefix }}-master-svc.{{ $namespace }}.svc.{{ $.Values.cluster.name }}.local,{{ end }}
+    celeborn.master.endpoints={{ range until (.Values.masterReplicas |int) }}{{ $.Release.Name }}-master-{{ . }}.{{ $.Release.Name }}-master-svc.{{ $namespace }}.svc.{{ $.Values.cluster.name }}.local,{{ end }}
     {{- range until (.Values.masterReplicas |int) }}
-    celeborn.master.ha.node.{{ . }}.host={{ $.Values.celebornClusterPrefix }}-master-{{ . }}.{{ $.Values.celebornClusterPrefix }}-master-svc.{{ $namespace }}.svc.{{ $.Values.cluster.name }}.local
+    celeborn.master.ha.node.{{ . }}.host={{ $.Release.Name }}-master-{{ . }}.{{ $.Release.Name }}-master-svc.{{ $namespace }}.svc.{{ $.Values.cluster.name }}.local
     {{- end }}
     {{- $dirs := .Values.volumes.master }}
     celeborn.master.ha.ratis.raft.server.storage.dir={{ (index $dirs 0).mountPath }}
diff --git a/charts/celeborn/templates/master-service.yaml b/charts/celeborn/templates/master-service.yaml
index 5e119531c05..667834a0c6e 100644
--- a/charts/celeborn/templates/master-service.yaml
+++ b/charts/celeborn/templates/master-service.yaml
@@ -18,7 +18,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ .Values.celebornClusterPrefix }}-master-svc
+  name: {{ .Release.Name }}-master-svc
   labels:
     helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version }}
     app.kubernetes.io/name: {{ .Chart.Name }}
diff --git a/charts/celeborn/templates/master-statefulset.yaml b/charts/celeborn/templates/master-statefulset.yaml
index 1cebc8b07e2..7ade09b64bc 100644
--- a/charts/celeborn/templates/master-statefulset.yaml
+++ b/charts/celeborn/templates/master-statefulset.yaml
@@ -18,7 +18,7 @@
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
-  name: {{ .Values.celebornClusterPrefix }}-master
+  name: {{ .Release.Name }}-master
   labels:
     helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version }}
     app.kubernetes.io/name: {{ .Chart.Name }}
@@ -35,7 +35,7 @@ spec:
       app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
       app.kubernetes.io/role: master
       {{- include "celeborn.selectorLabels" . | nindent 6 }}
-  serviceName: {{ .Values.celebornClusterPrefix }}-master-svc
+  serviceName: {{ .Release.Name }}-master-svc
   replicas: {{ .Values.masterReplicas }}
   template:
     metadata:
@@ -99,7 +99,7 @@ spec:
           - "/bin/sh"
           - '-c'
           {{- $namespace := .Release.Namespace }}
-          - "until {{ range until (.Values.masterReplicas |int) }}nslookup {{ $.Values.celebornClusterPrefix }}-master-{{ . }}.{{ $.Values.celebornClusterPrefix }}-master-svc.{{ $namespace }}.svc.{{ $.Values.cluster.name }}.local && {{ end }}true; do echo waiting for master; sleep 2; done && exec /opt/celeborn/sbin/start-master.sh"
+          - "until {{ range until (.Values.masterReplicas |int) }}nslookup {{ $.Release.Name }}-master-{{ . }}.{{ $.Release.Name }}-master-svc.{{ $namespace }}.svc.{{ $.Values.cluster.name }}.local && {{ end }}true; do echo waiting for master; sleep 2; done && exec /opt/celeborn/sbin/start-master.sh"
         resources:
           {{- toYaml .Values.resources.master | nindent 12 }}
         ports:
@@ -123,7 +123,7 @@ spec:
       terminationGracePeriodSeconds: 30 
       volumes:
         - configMap:
-            name: {{ .Values.celebornClusterPrefix }}-conf
+            name: {{ .Release.Name }}-conf
           name: {{ include "celeborn.fullname" . }}-volume
         {{- range $index, $volume := .Values.volumes.master }}
         - name: celeborn-master-vol-{{ $index }}
diff --git a/charts/celeborn/templates/prometheus-podmonitor.yaml b/charts/celeborn/templates/prometheus-podmonitor.yaml
index 241c30d0d06..d019058a05c 100644
--- a/charts/celeborn/templates/prometheus-podmonitor.yaml
+++ b/charts/celeborn/templates/prometheus-podmonitor.yaml
@@ -20,7 +20,7 @@
 apiVersion: monitoring.coreos.com/v1
 kind: PodMonitor
 metadata:
-  name: {{ .Values.celebornClusterPrefix }}-master-podmonitor
+  name: {{ .Release.Name }}-master-podmonitor
   labels:
     helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version }}
     app.kubernetes.io/name: {{ .Chart.Name }}
@@ -48,7 +48,7 @@ spec:
 apiVersion: monitoring.coreos.com/v1
 kind: PodMonitor
 metadata:
-  name: {{ .Values.celebornClusterPrefix }}-worker-podmonitor
+  name: {{ .Release.Name }}-worker-podmonitor
   labels:
     helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version }}
     app.kubernetes.io/name: {{ .Chart.Name }}
diff --git a/charts/celeborn/templates/worker-service.yaml b/charts/celeborn/templates/worker-service.yaml
index 061556a7db6..6b47b958f20 100644
--- a/charts/celeborn/templates/worker-service.yaml
+++ b/charts/celeborn/templates/worker-service.yaml
@@ -18,7 +18,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ .Values.celebornClusterPrefix }}-worker-svc
+  name: {{ .Release.Name }}-worker-svc
   labels:
     helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version }}
     app.kubernetes.io/name: {{ .Chart.Name }}
diff --git a/charts/celeborn/templates/worker-statefulset.yaml b/charts/celeborn/templates/worker-statefulset.yaml
index 55794c682d9..d4d5c7877f9 100644
--- a/charts/celeborn/templates/worker-statefulset.yaml
+++ b/charts/celeborn/templates/worker-statefulset.yaml
@@ -18,7 +18,7 @@
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
-  name: {{ .Values.celebornClusterPrefix }}-worker
+  name: {{ .Release.Name }}-worker
   labels:
     helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version }}
     app.kubernetes.io/name: {{ .Chart.Name }}
@@ -35,7 +35,7 @@ spec:
       app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
       app.kubernetes.io/role: worker
       {{- include "celeborn.selectorLabels" . | nindent 6 }}
-  serviceName: {{ .Values.celebornClusterPrefix }}-worker
+  serviceName: {{ .Release.Name }}-worker
   replicas: {{ .Values.workerReplicas }}
   template:
     metadata:
@@ -103,7 +103,7 @@ spec:
           - "/bin/sh"
           - '-c'
           {{- $namespace := .Release.Namespace }}
-          - "until {{ range until (.Values.masterReplicas |int) }}nslookup {{ $.Values.celebornClusterPrefix }}-master-{{ . }}.{{ $.Values.celebornClusterPrefix }}-master-svc.{{ $namespace }}.svc.{{ $.Values.cluster.name }}.local && {{ end }}true; do echo waiting for master; sleep 2; done && exec /opt/celeborn/sbin/start-worker.sh"
+          - "until {{ range until (.Values.masterReplicas |int) }}nslookup {{ $.Release.Name }}-master-{{ . }}.{{ $.Release.Name }}-master-svc.{{ $namespace }}.svc.{{ $.Values.cluster.name }}.local && {{ end }}true; do echo waiting for master; sleep 2; done && exec /opt/celeborn/sbin/start-worker.sh"
         resources:
           {{- toYaml .Values.resources.worker | nindent 12 }}
         ports:
@@ -128,7 +128,7 @@ spec:
       terminationGracePeriodSeconds: 30
       volumes:
         - configMap:
-            name: {{ .Values.celebornClusterPrefix }}-conf
+            name: {{ .Release.Name }}-conf
           name: {{ include "celeborn.fullname" . }}-volume
         {{- range $index, $volume := .Values.volumes.worker }}
         {{- if eq "emptyDir" $volume.type }}
diff --git a/charts/celeborn/values.yaml b/charts/celeborn/values.yaml
index 657b5405d05..d0b884019d0 100644
--- a/charts/celeborn/values.yaml
+++ b/charts/celeborn/values.yaml
@@ -32,8 +32,6 @@ imagePullSecrets: {}
 masterReplicas: 3
 # worker replicas set on demand, should less than node number
 workerReplicas: 5
-# celeborn resources' name prefix
-celebornClusterPrefix: celeborn
 
 hostNetwork: false
 dnsPolicy: ClusterFirst

From 84fd0b690d869945571103aa8931670b51053bda Mon Sep 17 00:00:00 2001
From: zwangsheng <2213335496@qq.com>
Date: Tue, 15 Aug 2023 10:31:23 +0800
Subject: [PATCH 4/5] fix comments

---
 charts/celeborn/templates/master-statefulset.yaml | 4 ++--
 charts/celeborn/templates/worker-statefulset.yaml | 5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/charts/celeborn/templates/master-statefulset.yaml b/charts/celeborn/templates/master-statefulset.yaml
index 7ade09b64bc..e9c6863938e 100644
--- a/charts/celeborn/templates/master-statefulset.yaml
+++ b/charts/celeborn/templates/master-statefulset.yaml
@@ -112,7 +112,7 @@ spec:
             name: {{ include "celeborn.fullname" . }}-volume
             readOnly: true
           {{- range $index, $volume := .Values.volumes.master }}
-          - name: celeborn-master-vol-{{ $index }}
+          - name: {{ $.Release.Name }}-master-vol-{{ $index }}
             mountPath: {{ .mountPath }}
           {{- end }}
         env:
@@ -126,7 +126,7 @@ spec:
             name: {{ .Release.Name }}-conf
           name: {{ include "celeborn.fullname" . }}-volume
         {{- range $index, $volume := .Values.volumes.master }}
-        - name: celeborn-master-vol-{{ $index }}
+        - name: {{ $.Release.Name }}-master-vol-{{ $index }}
         {{- if eq "emptyDir" $volume.type }}
           emptyDir:
             sizeLimit: {{ $volume.size }}
diff --git a/charts/celeborn/templates/worker-statefulset.yaml b/charts/celeborn/templates/worker-statefulset.yaml
index d4d5c7877f9..e5a6d0d70d8 100644
--- a/charts/celeborn/templates/worker-statefulset.yaml
+++ b/charts/celeborn/templates/worker-statefulset.yaml
@@ -117,7 +117,7 @@ spec:
             readOnly: true
           {{- end }}
           {{- range $index, $volume := .Values.volumes.worker }}
-          - name: celeborn-worker-vol-{{ $index }}
+          - name: {{ $.Release.Name }}-worker-vol-{{ $index }}
             mountPath: {{ .mountPath }}
           {{- end }}
         env:
@@ -131,12 +131,11 @@ spec:
             name: {{ .Release.Name }}-conf
           name: {{ include "celeborn.fullname" . }}-volume
         {{- range $index, $volume := .Values.volumes.worker }}
+        - name: {{ $.Release.Name }}-worker-vol-{{ $index }}
         {{- if eq "emptyDir" $volume.type }}
-        - name: celeborn-worker-vol-{{ $index }}
           emptyDir:
             sizeLimit: {{ $volume.size }}
         {{- else if eq "hostPath" $volume.type }}
-        - name: celeborn-worker-vol-{{ $index }}
           hostPath:
             path: {{ $volume.hostPath | default $volume.mountPath }}/worker
             type: DirectoryOrCreate

From 5494c6a9c168c5d3074e912fa681e43371a222d0 Mon Sep 17 00:00:00 2001
From: zwangsheng <2213335496@qq.com>
Date: Tue, 22 Aug 2023 14:29:07 +0800
Subject: [PATCH 5/5] remove podmonitor helm version match

---
 charts/celeborn/templates/prometheus-podmonitor.yaml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/charts/celeborn/templates/prometheus-podmonitor.yaml b/charts/celeborn/templates/prometheus-podmonitor.yaml
index d019058a05c..bfee5ffeefe 100644
--- a/charts/celeborn/templates/prometheus-podmonitor.yaml
+++ b/charts/celeborn/templates/prometheus-podmonitor.yaml
@@ -42,7 +42,6 @@ spec:
     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
 ---
 apiVersion: monitoring.coreos.com/v1
@@ -70,7 +69,6 @@ spec:
     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
 {{ end }}
 {{- end }}