Skip to content

Commit fe2aede

Browse files
jianxiaoguojianxiaoguo
committed
chore(kafka): support zookeeper mode config
1 parent 3af79b3 commit fe2aede

7 files changed

Lines changed: 279 additions & 54 deletions

File tree

‎addons/kafka/3.6/meta.yaml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,18 +27,33 @@ allow_parameters:
2727
- name: "controller.replicaCount"
2828
required: false
2929
description: "controller.replicaCount config for values.yaml"
30+
- name: "controller.controllerOnly"
31+
required: false
32+
description: "controller.controllerOnly config for values.yaml"
33+
- name: "controller.zookeeperMigrationMode"
34+
required: false
35+
description: "controller.zookeeperMigrationMode config for values.yaml"
3036
- name: "controller.nodeSelector"
3137
required: false
3238
description: "controller.nodeSelector config for values.yaml"
39+
- name: "controller.persistence"
40+
required: false
41+
description: "controller.persistence config for values.yaml"
3342
- name: "broker.replicaCount"
3443
required: false
3544
description: "broker.replicaCount config for values.yaml"
45+
- name: "broker.zookeeperMigrationMode"
46+
required: false
47+
description: "broker.zookeeperMigrationMode config for values.yaml"
3648
- name: "broker.extraConfig"
3749
required: false
3850
description: "broker.extraConfig config for values.yaml"
3951
- name: "broker.nodeSelector"
4052
required: false
4153
description: "broker.nodeSelector config for values.yaml"
54+
- name: "broker.persistence"
55+
required: false
56+
description: "broker.persistence config for values.yaml"
4257
- name: "listeners.client.protocol"
4358
required: false
4459
description: "listeners client protocol config for values.yaml"

‎addons/kafka/3.6/plans/standard-16c32g3w/bind.yaml‎

Lines changed: 44 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
{{- $releaseNamespace := .Release.Namespace }}
2+
{{- $clusterDomain := .Values.clusterDomain }}
3+
{{- $fullname := include "common.names.fullname" . }}
4+
{{- $clientPort := int .Values.listeners.client.containerPort }}
15
credential:
26
- name: PROTOCOL_MAP
37
value: {{ include "kafka.securityProtocolMap" . }}
@@ -23,27 +27,44 @@ credential:
2327
serviceRef:
2428
name: {{ template "common.names.fullname" . }}
2529
jsonpath: '{ .status.loadBalancer.ingress[*].ip }'
26-
{{- end }}
2730

28-
{{- if .Values.externalAccess.enabled }}
2931
- name: EXTERNAL_CLIENT_PORT
3032
valueFrom:
3133
serviceRef:
3234
name: {{ template "common.names.fullname" . }}
3335
jsonpath: '{ .spec.ports[?(@.name=="tcp-external")].port }'
3436
{{- end }}
3537

36-
37-
{{- range $i, $internelListeners := ( splitList "," ( include "kafka.kraft.internelListeners" . ) )}}
38+
{{- $brokerList := list }}
39+
{{- if or (not .Values.kraft.enabled) (.Values.controller.controllerOnly) }}
40+
{{- range $i := until (int .Values.broker.replicaCount) }}
41+
{{- $brokerList = append $brokerList (printf "%s-broker-%d.%s-broker-headless.%s.svc.%s" $fullname $i $fullname $releaseNamespace $clusterDomain ) }}
42+
{{- end }}
43+
{{- else }}
44+
{{- range $i := until (int .Values.controller.replicaCount) }}
45+
{{- $brokerList = append $brokerList (printf "%s-controller-%d.%s-controller-headless.%s.svc.%s" $fullname $i $fullname $releaseNamespace $clusterDomain ) }}
46+
{{- end }}
47+
{{- end }}
48+
{{- range $i, $broker := ( $brokerList )}}
3849
- name: {{ printf "KAFKA_NODE_%d" $i }}
39-
value: {{ $internelListeners }}
50+
value: {{ $broker }}
4051
{{- end }}
4152

42-
- name: KAFKA_PORT
53+
{{- $replicaCount := int .Values.broker.replicaCount }}
54+
{{- if gt $replicaCount 0 }}
55+
- name: KAFKA_NODE_PORT
4356
valueFrom:
4457
serviceRef:
45-
name: {{ template "common.names.fullname" . }}
58+
name: {{ printf "%s-broker-headless" (include "common.names.fullname" .) | trunc 63 | trimSuffix "-" }}
4659
jsonpath: '{ .spec.ports[?(@.name=="tcp-client")].port }'
60+
{{- else }}
61+
- name: KAFKA_NODE_PORT
62+
valueFrom:
63+
serviceRef:
64+
name: {{ printf "%s-controller-headless" (include "common.names.fullname" .) | trunc 63 | trimSuffix "-" }}
65+
jsonpath: '{ .spec.ports[?(@.name=="tcp-client")].port }'
66+
{{- end }}
67+
4768

4869
{{- if (include "kafka.saslUserPasswordsEnabled" .) }}
4970
{{- if (include "kafka.client.saslEnabled" .) }}
@@ -75,8 +96,21 @@ credential:
7596
{{- end }}
7697
{{- end }}
7798

99+
78100
{{- if .Values.externalAccess.enabled }}
79-
{{- $fullname := include "common.names.fullname" . }}
101+
{{- if or (not .Values.kraft.enabled) (.Values.controller.controllerOnly) }}
102+
{{- $replicaCount := .Values.broker.replicaCount | int }}
103+
{{- range $i := until $replicaCount }}
104+
- name: {{ printf "EXTERNAL_KAFKA_NODE_%d" $i }}
105+
valueFrom:
106+
serviceRef:
107+
name: {{ printf "%s-broker-%d-external" (include "common.names.fullname" $) $i | trunc 63 | trimSuffix "-" }}
108+
jsonpath: '{ .status.loadBalancer.ingress[*].ip }'
109+
{{- end }}
110+
111+
- name: EXTERNAL_KAFKA_NODE_PORT
112+
value: {{ .Values.externalAccess.broker.service.ports.external }}
113+
{{- else }}
80114
{{- $replicaCount := .Values.controller.replicaCount | int }}
81115
{{- range $i := until $replicaCount }}
82116
- name: {{ printf "EXTERNAL_KAFKA_NODE_%d" $i }}
@@ -86,6 +120,7 @@ credential:
86120
jsonpath: '{ .status.loadBalancer.ingress[*].ip }'
87121
{{- end }}
88122

89-
- name: EXTERNAL_KAFKA_PORT
123+
- name: EXTERNAL_KAFKA_NODE_PORT
90124
value: {{ .Values.externalAccess.controller.service.ports.external }}
125+
{{- end }}
91126
{{- end }}

‎addons/kafka/3.6/plans/standard-1c2g3w/bind.yaml‎

Lines changed: 44 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
{{- $releaseNamespace := .Release.Namespace }}
2+
{{- $clusterDomain := .Values.clusterDomain }}
3+
{{- $fullname := include "common.names.fullname" . }}
4+
{{- $clientPort := int .Values.listeners.client.containerPort }}
15
credential:
26
- name: PROTOCOL_MAP
37
value: {{ include "kafka.securityProtocolMap" . }}
@@ -23,27 +27,44 @@ credential:
2327
serviceRef:
2428
name: {{ template "common.names.fullname" . }}
2529
jsonpath: '{ .status.loadBalancer.ingress[*].ip }'
26-
{{- end }}
2730

28-
{{- if .Values.externalAccess.enabled }}
2931
- name: EXTERNAL_CLIENT_PORT
3032
valueFrom:
3133
serviceRef:
3234
name: {{ template "common.names.fullname" . }}
3335
jsonpath: '{ .spec.ports[?(@.name=="tcp-external")].port }'
3436
{{- end }}
3537

36-
37-
{{- range $i, $internelListeners := ( splitList "," ( include "kafka.kraft.internelListeners" . ) )}}
38+
{{- $brokerList := list }}
39+
{{- if or (not .Values.kraft.enabled) (.Values.controller.controllerOnly) }}
40+
{{- range $i := until (int .Values.broker.replicaCount) }}
41+
{{- $brokerList = append $brokerList (printf "%s-broker-%d.%s-broker-headless.%s.svc.%s" $fullname $i $fullname $releaseNamespace $clusterDomain ) }}
42+
{{- end }}
43+
{{- else }}
44+
{{- range $i := until (int .Values.controller.replicaCount) }}
45+
{{- $brokerList = append $brokerList (printf "%s-controller-%d.%s-controller-headless.%s.svc.%s" $fullname $i $fullname $releaseNamespace $clusterDomain ) }}
46+
{{- end }}
47+
{{- end }}
48+
{{- range $i, $broker := ( $brokerList )}}
3849
- name: {{ printf "KAFKA_NODE_%d" $i }}
39-
value: {{ $internelListeners }}
50+
value: {{ $broker }}
4051
{{- end }}
4152

42-
- name: KAFKA_PORT
53+
{{- $replicaCount := int .Values.broker.replicaCount }}
54+
{{- if gt $replicaCount 0 }}
55+
- name: KAFKA_NODE_PORT
4356
valueFrom:
4457
serviceRef:
45-
name: {{ template "common.names.fullname" . }}
58+
name: {{ printf "%s-broker-headless" (include "common.names.fullname" .) | trunc 63 | trimSuffix "-" }}
4659
jsonpath: '{ .spec.ports[?(@.name=="tcp-client")].port }'
60+
{{- else }}
61+
- name: KAFKA_NODE_PORT
62+
valueFrom:
63+
serviceRef:
64+
name: {{ printf "%s-controller-headless" (include "common.names.fullname" .) | trunc 63 | trimSuffix "-" }}
65+
jsonpath: '{ .spec.ports[?(@.name=="tcp-client")].port }'
66+
{{- end }}
67+
4768

4869
{{- if (include "kafka.saslUserPasswordsEnabled" .) }}
4970
{{- if (include "kafka.client.saslEnabled" .) }}
@@ -75,8 +96,21 @@ credential:
7596
{{- end }}
7697
{{- end }}
7798

99+
78100
{{- if .Values.externalAccess.enabled }}
79-
{{- $fullname := include "common.names.fullname" . }}
101+
{{- if or (not .Values.kraft.enabled) (.Values.controller.controllerOnly) }}
102+
{{- $replicaCount := .Values.broker.replicaCount | int }}
103+
{{- range $i := until $replicaCount }}
104+
- name: {{ printf "EXTERNAL_KAFKA_NODE_%d" $i }}
105+
valueFrom:
106+
serviceRef:
107+
name: {{ printf "%s-broker-%d-external" (include "common.names.fullname" $) $i | trunc 63 | trimSuffix "-" }}
108+
jsonpath: '{ .status.loadBalancer.ingress[*].ip }'
109+
{{- end }}
110+
111+
- name: EXTERNAL_KAFKA_NODE_PORT
112+
value: {{ .Values.externalAccess.broker.service.ports.external }}
113+
{{- else }}
80114
{{- $replicaCount := .Values.controller.replicaCount | int }}
81115
{{- range $i := until $replicaCount }}
82116
- name: {{ printf "EXTERNAL_KAFKA_NODE_%d" $i }}
@@ -86,6 +120,7 @@ credential:
86120
jsonpath: '{ .status.loadBalancer.ingress[*].ip }'
87121
{{- end }}
88122

89-
- name: EXTERNAL_KAFKA_PORT
123+
- name: EXTERNAL_KAFKA_NODE_PORT
90124
value: {{ .Values.externalAccess.controller.service.ports.external }}
125+
{{- end }}
91126
{{- end }}

‎addons/kafka/3.6/plans/standard-24c64g3w/bind.yaml‎

Lines changed: 44 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
{{- $releaseNamespace := .Release.Namespace }}
2+
{{- $clusterDomain := .Values.clusterDomain }}
3+
{{- $fullname := include "common.names.fullname" . }}
4+
{{- $clientPort := int .Values.listeners.client.containerPort }}
15
credential:
26
- name: PROTOCOL_MAP
37
value: {{ include "kafka.securityProtocolMap" . }}
@@ -23,27 +27,44 @@ credential:
2327
serviceRef:
2428
name: {{ template "common.names.fullname" . }}
2529
jsonpath: '{ .status.loadBalancer.ingress[*].ip }'
26-
{{- end }}
2730

28-
{{- if .Values.externalAccess.enabled }}
2931
- name: EXTERNAL_CLIENT_PORT
3032
valueFrom:
3133
serviceRef:
3234
name: {{ template "common.names.fullname" . }}
3335
jsonpath: '{ .spec.ports[?(@.name=="tcp-external")].port }'
3436
{{- end }}
3537

36-
37-
{{- range $i, $internelListeners := ( splitList "," ( include "kafka.kraft.internelListeners" . ) )}}
38+
{{- $brokerList := list }}
39+
{{- if or (not .Values.kraft.enabled) (.Values.controller.controllerOnly) }}
40+
{{- range $i := until (int .Values.broker.replicaCount) }}
41+
{{- $brokerList = append $brokerList (printf "%s-broker-%d.%s-broker-headless.%s.svc.%s" $fullname $i $fullname $releaseNamespace $clusterDomain ) }}
42+
{{- end }}
43+
{{- else }}
44+
{{- range $i := until (int .Values.controller.replicaCount) }}
45+
{{- $brokerList = append $brokerList (printf "%s-controller-%d.%s-controller-headless.%s.svc.%s" $fullname $i $fullname $releaseNamespace $clusterDomain ) }}
46+
{{- end }}
47+
{{- end }}
48+
{{- range $i, $broker := ( $brokerList )}}
3849
- name: {{ printf "KAFKA_NODE_%d" $i }}
39-
value: {{ $internelListeners }}
50+
value: {{ $broker }}
4051
{{- end }}
4152

42-
- name: KAFKA_PORT
53+
{{- $replicaCount := int .Values.broker.replicaCount }}
54+
{{- if gt $replicaCount 0 }}
55+
- name: KAFKA_NODE_PORT
4356
valueFrom:
4457
serviceRef:
45-
name: {{ template "common.names.fullname" . }}
58+
name: {{ printf "%s-broker-headless" (include "common.names.fullname" .) | trunc 63 | trimSuffix "-" }}
4659
jsonpath: '{ .spec.ports[?(@.name=="tcp-client")].port }'
60+
{{- else }}
61+
- name: KAFKA_NODE_PORT
62+
valueFrom:
63+
serviceRef:
64+
name: {{ printf "%s-controller-headless" (include "common.names.fullname" .) | trunc 63 | trimSuffix "-" }}
65+
jsonpath: '{ .spec.ports[?(@.name=="tcp-client")].port }'
66+
{{- end }}
67+
4768

4869
{{- if (include "kafka.saslUserPasswordsEnabled" .) }}
4970
{{- if (include "kafka.client.saslEnabled" .) }}
@@ -75,8 +96,21 @@ credential:
7596
{{- end }}
7697
{{- end }}
7798

99+
78100
{{- if .Values.externalAccess.enabled }}
79-
{{- $fullname := include "common.names.fullname" . }}
101+
{{- if or (not .Values.kraft.enabled) (.Values.controller.controllerOnly) }}
102+
{{- $replicaCount := .Values.broker.replicaCount | int }}
103+
{{- range $i := until $replicaCount }}
104+
- name: {{ printf "EXTERNAL_KAFKA_NODE_%d" $i }}
105+
valueFrom:
106+
serviceRef:
107+
name: {{ printf "%s-broker-%d-external" (include "common.names.fullname" $) $i | trunc 63 | trimSuffix "-" }}
108+
jsonpath: '{ .status.loadBalancer.ingress[*].ip }'
109+
{{- end }}
110+
111+
- name: EXTERNAL_KAFKA_NODE_PORT
112+
value: {{ .Values.externalAccess.broker.service.ports.external }}
113+
{{- else }}
80114
{{- $replicaCount := .Values.controller.replicaCount | int }}
81115
{{- range $i := until $replicaCount }}
82116
- name: {{ printf "EXTERNAL_KAFKA_NODE_%d" $i }}
@@ -86,6 +120,7 @@ credential:
86120
jsonpath: '{ .status.loadBalancer.ingress[*].ip }'
87121
{{- end }}
88122

89-
- name: EXTERNAL_KAFKA_PORT
123+
- name: EXTERNAL_KAFKA_NODE_PORT
90124
value: {{ .Values.externalAccess.controller.service.ports.external }}
125+
{{- end }}
91126
{{- end }}

0 commit comments

Comments
 (0)