From 7022699dacb36ba808a6b098ac56c5b07504fd04 Mon Sep 17 00:00:00 2001
From: Leon <leon@apecloud.com>
Date: Thu, 6 Feb 2025 14:56:23 +0800
Subject: [PATCH] chore: delete the secret-ref for the kafka account (#1447)

---
 addons/kafka/templates/_helpers.tpl            | 14 --------------
 addons/kafka/templates/account-client.yaml     |  7 -------
 addons/kafka/templates/account-superusers.yaml |  7 -------
 addons/kafka/templates/cmpd-broker-27.yaml     | 15 +--------------
 addons/kafka/templates/cmpd-broker.yaml        | 15 +--------------
 addons/kafka/templates/cmpd-combine.yaml       | 15 +--------------
 6 files changed, 3 insertions(+), 70 deletions(-)
 delete mode 100644 addons/kafka/templates/account-client.yaml
 delete mode 100644 addons/kafka/templates/account-superusers.yaml

diff --git a/addons/kafka/templates/_helpers.tpl b/addons/kafka/templates/_helpers.tpl
index 449dce14a..a9b151da2 100644
--- a/addons/kafka/templates/_helpers.tpl
+++ b/addons/kafka/templates/_helpers.tpl
@@ -197,17 +197,3 @@ Define kafka tools scripts tpl name
 {{- define "kafka.toolsScriptsTplName" -}}
 kafka-tools-scripts-tpl
 {{- end -}}
-
-{{/*
-Define kafka default client system account secret name
-*/}}
-{{- define "kafka.defaultClientSystemAccountSecretName" -}}
-kafka-client-secret
-{{- end -}}
-
-{{/*
-Define kafka default superuser system account secret name
-*/}}
-{{- define "kafka.defaultSuperUserSystemAccountSecretName" -}}
-kafka-superusers-secret
-{{- end -}}
diff --git a/addons/kafka/templates/account-client.yaml b/addons/kafka/templates/account-client.yaml
deleted file mode 100644
index 029200555..000000000
--- a/addons/kafka/templates/account-client.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-apiVersion: v1
-kind: Secret
-metadata:
-  name: {{ include "kafka.defaultClientSystemAccountSecretName" . }}
-type: Opaque
-stringData:
-  password: "kubeblocks"
\ No newline at end of file
diff --git a/addons/kafka/templates/account-superusers.yaml b/addons/kafka/templates/account-superusers.yaml
deleted file mode 100644
index 0a4a70a8b..000000000
--- a/addons/kafka/templates/account-superusers.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-apiVersion: v1
-kind: Secret
-metadata:
-  name: {{ include "kafka.defaultSuperUserSystemAccountSecretName" . }}
-type: Opaque
-stringData:
-  password: "kubeblocks"
\ No newline at end of file
diff --git a/addons/kafka/templates/cmpd-broker-27.yaml b/addons/kafka/templates/cmpd-broker-27.yaml
index 46889fc86..ea6f0e46c 100644
--- a/addons/kafka/templates/cmpd-broker-27.yaml
+++ b/addons/kafka/templates/cmpd-broker-27.yaml
@@ -39,11 +39,7 @@ spec:
         clusterVarRef:
           clusterUID: Required
     - name: SUPER_USER
-      valueFrom:
-        credentialVarRef:
-          name: admin
-          username: Required
-          optional: false
+      value: admin
     - name: POD_FQDN_LIST
       valueFrom:
         componentVarRef:
@@ -84,15 +80,6 @@ spec:
           port:
             name: broker
             option: Optional
-  systemAccounts:
-    - name: client
-      secretRef:
-        name: {{ include "kafka.defaultClientSystemAccountSecretName" . }}
-        namespace: {{ .Release.Namespace }}
-    - name: admin
-      secretRef:
-        name: {{ include "kafka.defaultSuperUserSystemAccountSecretName" . }}
-        namespace: {{ .Release.Namespace }}
   ## serial is not used because rsm currently does not support kafka's role detection. The lack of role label during restart will affect the pod restart.
   updateStrategy: BestEffortParallel
   configs:
diff --git a/addons/kafka/templates/cmpd-broker.yaml b/addons/kafka/templates/cmpd-broker.yaml
index 5f97184d1..82257b0c7 100644
--- a/addons/kafka/templates/cmpd-broker.yaml
+++ b/addons/kafka/templates/cmpd-broker.yaml
@@ -33,11 +33,7 @@ spec:
         clusterVarRef:
           clusterUID: Required
     - name: SUPER_USER
-      valueFrom:
-        credentialVarRef:
-          name: admin
-          username: Required
-          optional: false
+      value: admin
     - name: POD_FQDN_LIST
       valueFrom:
         componentVarRef:
@@ -80,15 +76,6 @@ spec:
           port:
             name: broker
             option: Optional
-  systemAccounts:
-    - name: client
-      secretRef:
-        name: {{ include "kafka.defaultClientSystemAccountSecretName" . }}
-        namespace: {{ .Release.Namespace }}
-    - name: admin
-      secretRef:
-        name: {{ include "kafka.defaultSuperUserSystemAccountSecretName" . }}
-        namespace: {{ .Release.Namespace }}
   ## serial is not used because rsm currently does not support kafka's role detection. The lack of role label during restart will affect the pod restart.
   updateStrategy: BestEffortParallel
   configs:
diff --git a/addons/kafka/templates/cmpd-combine.yaml b/addons/kafka/templates/cmpd-combine.yaml
index a1b1fe668..740440476 100644
--- a/addons/kafka/templates/cmpd-combine.yaml
+++ b/addons/kafka/templates/cmpd-combine.yaml
@@ -36,11 +36,7 @@ spec:
         clusterVarRef:
           clusterUID: Required
     - name: SUPER_USER
-      valueFrom:
-        credentialVarRef:
-          name: admin
-          username: Required
-          optional: false
+      value: admin
     - name: POD_FQDN_LIST
       valueFrom:
         componentVarRef:
@@ -71,15 +67,6 @@ spec:
           port:
             name: broker
             option: Optional
-  systemAccounts:
-    - name: client
-      secretRef:
-        name: {{ include "kafka.defaultClientSystemAccountSecretName" . }}
-        namespace: {{ .Release.Namespace }}
-    - name: admin
-      secretRef:
-        name: {{ include "kafka.defaultSuperUserSystemAccountSecretName" . }}
-        namespace: {{ .Release.Namespace }}
   ## serial is not used because rsm currently does not support kafka's role detection. The lack of role label during restart will affect the pod restart.
   updateStrategy: BestEffortParallel
   configs: