From d12273293deb9e6cddc1c3bdbc4d7f983bc6f54b Mon Sep 17 00:00:00 2001
From: lxy <391861737@qq.com>
Date: Mon, 4 Dec 2023 10:02:10 +0800
Subject: [PATCH 1/2] fix: ServiceAccountName inconsistency

---
 charts/rocketmq-operator/templates/operator.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/rocketmq-operator/templates/operator.yaml b/charts/rocketmq-operator/templates/operator.yaml
index 42da5bb4..25e81b60 100644
--- a/charts/rocketmq-operator/templates/operator.yaml
+++ b/charts/rocketmq-operator/templates/operator.yaml
@@ -27,7 +27,7 @@ spec:
       labels:
         name: rocketmq-operator
     spec:
-      serviceAccountName: rocketmq-operator
+      serviceAccountName: {{ template "rocketmq-operator.serviceAccountName" . }}
       terminationGracePeriodSeconds: 10
       containers:
       - name: manager

From 455530e5096fec571c8af21121de7683b1219534 Mon Sep 17 00:00:00 2001
From: lxy <391861737@qq.com>
Date: Tue, 26 Dec 2023 10:12:27 +0800
Subject: [PATCH 2/2] fix: ServiceAccountName inconsistency re deploy

---
 deploy/operator.yaml        | 2 +-
 deploy/role_binding.yaml    | 2 +-
 deploy/service_account.yaml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/deploy/operator.yaml b/deploy/operator.yaml
index d8a90585..1a5463c3 100644
--- a/deploy/operator.yaml
+++ b/deploy/operator.yaml
@@ -27,7 +27,7 @@ spec:
       labels:
         name: rocketmq-operator
     spec:
-      serviceAccountName: rocketmq-operator
+      serviceAccountName: {{ template "rocketmq-operator.serviceAccountName" . }}
       terminationGracePeriodSeconds: 10
       containers:
       - name: manager
diff --git a/deploy/role_binding.yaml b/deploy/role_binding.yaml
index f330555b..d778869d 100644
--- a/deploy/role_binding.yaml
+++ b/deploy/role_binding.yaml
@@ -19,7 +19,7 @@ metadata:
   name: rocketmq-operator
 subjects:
 - kind: ServiceAccount
-  name: rocketmq-operator
+  name: {{ template "rocketmq-operator.serviceAccountName" . }}
   namespace: default
 roleRef:
   kind: ClusterRole
diff --git a/deploy/service_account.yaml b/deploy/service_account.yaml
index 2dde8f9e..8f1a58ff 100644
--- a/deploy/service_account.yaml
+++ b/deploy/service_account.yaml
@@ -16,4 +16,4 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: rocketmq-operator
+  name: {{ template "rocketmq-operator.serviceAccountName" . }}