Skip to content

Commit 433249a

Browse files
leon-apeleon-inf
authored andcommitted
chore: delete the secret-ref for the kafka account (#1447)
(cherry picked from commit 7022699)
1 parent 62640c7 commit 433249a

File tree

6 files changed

+3
-70
lines changed

6 files changed

+3
-70
lines changed

addons/kafka/templates/_helpers.tpl

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -197,17 +197,3 @@ Define kafka tools scripts tpl name
197197
{{- define "kafka.toolsScriptsTplName" -}}
198198
kafka-tools-scripts-tpl
199199
{{- end -}}
200-
201-
{{/*
202-
Define kafka default client system account secret name
203-
*/}}
204-
{{- define "kafka.defaultClientSystemAccountSecretName" -}}
205-
kafka-client-secret
206-
{{- end -}}
207-
208-
{{/*
209-
Define kafka default superuser system account secret name
210-
*/}}
211-
{{- define "kafka.defaultSuperUserSystemAccountSecretName" -}}
212-
kafka-superusers-secret
213-
{{- end -}}

addons/kafka/templates/account-client.yaml

Lines changed: 0 additions & 7 deletions
This file was deleted.

addons/kafka/templates/account-superusers.yaml

Lines changed: 0 additions & 7 deletions
This file was deleted.

addons/kafka/templates/cmpd-broker-27.yaml

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,7 @@ spec:
3939
clusterVarRef:
4040
clusterUID: Required
4141
- name: SUPER_USER
42-
valueFrom:
43-
credentialVarRef:
44-
name: admin
45-
username: Required
46-
optional: false
42+
value: admin
4743
- name: POD_FQDN_LIST
4844
valueFrom:
4945
componentVarRef:
@@ -84,15 +80,6 @@ spec:
8480
port:
8581
name: broker
8682
option: Optional
87-
systemAccounts:
88-
- name: client
89-
secretRef:
90-
name: {{ include "kafka.defaultClientSystemAccountSecretName" . }}
91-
namespace: {{ .Release.Namespace }}
92-
- name: admin
93-
secretRef:
94-
name: {{ include "kafka.defaultSuperUserSystemAccountSecretName" . }}
95-
namespace: {{ .Release.Namespace }}
9683
## 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.
9784
updateStrategy: BestEffortParallel
9885
configs:

addons/kafka/templates/cmpd-broker.yaml

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,7 @@ spec:
3333
clusterVarRef:
3434
clusterUID: Required
3535
- name: SUPER_USER
36-
valueFrom:
37-
credentialVarRef:
38-
name: admin
39-
username: Required
40-
optional: false
36+
value: admin
4137
- name: POD_FQDN_LIST
4238
valueFrom:
4339
componentVarRef:
@@ -80,15 +76,6 @@ spec:
8076
port:
8177
name: broker
8278
option: Optional
83-
systemAccounts:
84-
- name: client
85-
secretRef:
86-
name: {{ include "kafka.defaultClientSystemAccountSecretName" . }}
87-
namespace: {{ .Release.Namespace }}
88-
- name: admin
89-
secretRef:
90-
name: {{ include "kafka.defaultSuperUserSystemAccountSecretName" . }}
91-
namespace: {{ .Release.Namespace }}
9279
## 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.
9380
updateStrategy: BestEffortParallel
9481
configs:

addons/kafka/templates/cmpd-combine.yaml

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,7 @@ spec:
3636
clusterVarRef:
3737
clusterUID: Required
3838
- name: SUPER_USER
39-
valueFrom:
40-
credentialVarRef:
41-
name: admin
42-
username: Required
43-
optional: false
39+
value: admin
4440
- name: POD_FQDN_LIST
4541
valueFrom:
4642
componentVarRef:
@@ -71,15 +67,6 @@ spec:
7167
port:
7268
name: broker
7369
option: Optional
74-
systemAccounts:
75-
- name: client
76-
secretRef:
77-
name: {{ include "kafka.defaultClientSystemAccountSecretName" . }}
78-
namespace: {{ .Release.Namespace }}
79-
- name: admin
80-
secretRef:
81-
name: {{ include "kafka.defaultSuperUserSystemAccountSecretName" . }}
82-
namespace: {{ .Release.Namespace }}
8370
## 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.
8471
updateStrategy: BestEffortParallel
8572
configs:

0 commit comments

Comments
 (0)