chore: delete the secret-ref for the kafka account (#1447)

apecloud · Feb 6, 2025 · 7022699 · 7022699
1 parent 8b00fc3
commit 7022699
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 70 deletions.
diff --git 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
diff --git a/addons/kafka/templates/account-superusers.yaml b/addons/kafka/templates/account-superusers.yaml
diff --git 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
@@ -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
@@ -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: