From fb637d2f833bb73ccd188b60b29ba81296428203 Mon Sep 17 00:00:00 2001
From: zyy17 <zyylsxm@gmail.com>
Date: Wed, 27 Dec 2023 12:17:38 +0800
Subject: [PATCH] refactor: modify datanode serviceaccount name

---
 charts/greptimedb-cluster/README.md                            | 3 +--
 charts/greptimedb-cluster/templates/cluster.yaml               | 2 +-
 .../greptimedb-cluster/templates/datanode-serviceaccount.yaml  | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/charts/greptimedb-cluster/README.md b/charts/greptimedb-cluster/README.md
index c8d7b4a..0e0ce7b 100644
--- a/charts/greptimedb-cluster/README.md
+++ b/charts/greptimedb-cluster/README.md
@@ -65,7 +65,7 @@ helm uninstall mycluster -n default
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
 | datanode.config | string | `""` | Extra datanode config in toml format. |
-| datanode.podTemplate | object | `{"affinity":{},"annotations":{},"labels":{},"main":{"args":[],"command":[],"env":[],"image":"","resources":{"limits":{},"requests":{}}},"nodeSelector":{},"serviceaccount":{"annotations":{},"create":false,"name":"datanode-sa"},"tolerations":[]}` | The pod template for datanode |
+| datanode.podTemplate | object | `{"affinity":{},"annotations":{},"labels":{},"main":{"args":[],"command":[],"env":[],"image":"","resources":{"limits":{},"requests":{}}},"nodeSelector":{},"serviceaccount":{"annotations":{},"create":false},"tolerations":[]}` | The pod template for datanode |
 | datanode.podTemplate.affinity | object | `{}` | The pod affinity |
 | datanode.podTemplate.annotations | object | `{}` | The annotations to be created to the pod. |
 | datanode.podTemplate.labels | object | `{}` | The labels to be created to the pod. |
@@ -79,7 +79,6 @@ helm uninstall mycluster -n default
 | datanode.podTemplate.nodeSelector | object | `{}` | The pod node selector |
 | datanode.podTemplate.serviceaccount.annotations | object | `{}` | The annotations for datanode serviceaccount |
 | datanode.podTemplate.serviceaccount.create | bool | `false` | Create a service account |
-| datanode.podTemplate.serviceaccount.name | string | `"datanode-sa"` | The serviceaccount name |
 | datanode.podTemplate.tolerations | list | `[]` | The pod tolerations |
 | datanode.replicas | int | `3` | Datanode replicas |
 | datanode.storage.storageClassName | string | `nil` | Storage class for datanode persistent volume |
diff --git a/charts/greptimedb-cluster/templates/cluster.yaml b/charts/greptimedb-cluster/templates/cluster.yaml
index 8c25e8e..1e7273e 100644
--- a/charts/greptimedb-cluster/templates/cluster.yaml
+++ b/charts/greptimedb-cluster/templates/cluster.yaml
@@ -139,7 +139,7 @@ spec:
       labels: {{ .Values.datanode.podTemplate.labels | toYaml | nindent 8 }}
       {{- end }}
       {{- if .Values.datanode.podTemplate.serviceaccount.create }}
-      serviceAccountName: {{ .Values.datanode.podTemplate.serviceaccount.name }}
+      serviceAccountName: {{ .Release.Name }}-datanode
       {{- end }}
       {{- if .Values.datanode.podTemplate.tolerations }}
       tolerations: {{ .Values.datanode.podTemplate.tolerations | toYaml | nindent 8 }}
diff --git a/charts/greptimedb-cluster/templates/datanode-serviceaccount.yaml b/charts/greptimedb-cluster/templates/datanode-serviceaccount.yaml
index fd67483..6e01b01 100644
--- a/charts/greptimedb-cluster/templates/datanode-serviceaccount.yaml
+++ b/charts/greptimedb-cluster/templates/datanode-serviceaccount.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: {{ .Values.datanode.podTemplate.serviceaccount.name }}
+  name: {{ .Release.Name }}-datanode
   namespace: {{ .Release.Namespace }}
   {{- with .Values.datanode.podTemplate.serviceaccount.annotations }}
   annotations: