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] 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