refactor: modify datanode serviceaccount name

GreptimeTeam · Dec 27, 2023 · fb637d2 · fb637d2
1 parent 6b1bcec
commit fb637d2
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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: