diff --git a/charts/pulsar/templates/zookeeper-statefulset.yaml b/charts/pulsar/templates/zookeeper-statefulset.yaml index 5590a40..a72d50b 100644 --- a/charts/pulsar/templates/zookeeper-statefulset.yaml +++ b/charts/pulsar/templates/zookeeper-statefulset.yaml @@ -138,10 +138,19 @@ spec: containerPort: {{ .Values.zookeeper.ports.clientTls }} {{- end }} env: - - name: ZOOKEEPER_SERVERS - value: - {{- $global := . }} - {{ range $i, $e := until (.Values.zookeeper.replicaCount | int) }}{{ if ne $i 0 }},{{ end }}{{ template "pulsar.fullname" $global }}-{{ $global.Values.zookeeper.component }}-{{ printf "%d" $i }}{{ end }} + - name: ZOOKEEPER_SERVERS + {{- if .Values.zookeeper.configData.ZOOKEEPER_SERVERS }} + value: {{ .Values.zookeeper.configData.ZOOKEEPER_SERVERS }} + {{- else }} + {{- $global := . }} + value: {{ range $i, $e := until (.Values.zookeeper.replicaCount | int) }}{{ if ne $i 0 }},{{ end }}{{ template "pulsar.fullname" $global }}-{{ $global.Values.zookeeper.component }}-{{ printf "%d" $i }}{{ end }} + {{- end }} + - name: EXTERNAL_PROVIDED_SERVERS + {{- if .Values.zookeeper.configData.ZOOKEEPER_SERVERS }} + value: "true" + {{- else }} + value: "false" + {{- end }} envFrom: - configMapRef: name: "{{ template "pulsar.fullname" . }}-{{ .Values.zookeeper.component }}" diff --git a/charts/pulsar/values.yaml b/charts/pulsar/values.yaml index a602edb..5d970e1 100644 --- a/charts/pulsar/values.yaml +++ b/charts/pulsar/values.yaml @@ -397,6 +397,8 @@ zookeeper: ## templates/zookeeper-configmap.yaml ## configData: + # External zookeeper server list in case of global-zk list to create zk cluster across zk deployed on different clusters/namespaces + # ZOOKEEPER_SERVERS: "us-east1-pulsar-zookeeper-0.us-east1-pulsar-zookeeper.us-east1.svc.cluster.local:2888:3888,us-east1-pulsar-zookeeper-1.us-east1-pulsar-zookeeper.us-east1.svc.cluster.local:2888:3888,us-east1-pulsar-zookeeper-2.us-east1-pulsar-zookeeper.us-east1.svc.cluster.local:2888:3888,us-west1-pulsar-zookeeper-0.us-west1-pulsar-zookeeper.us-west1.svc.cluster.local:2888:3888,us-west1-pulsar-zookeeper-1.us-west1-pulsar-zookeeper.us-west1.svc.cluster.local:2888:3888,us-west1-pulsar-zookeeper-2.us-west1-pulsar-zookeeper.us-west1.svc.cluster.local:2888:3888" PULSAR_MEM: > -Xms64m -Xmx128m PULSAR_GC: > diff --git a/examples/values-zookeeper-aws.yaml b/examples/values-zookeeper-aws.yaml index 8b870ef..2116f86 100644 --- a/examples/values-zookeeper-aws.yaml +++ b/examples/values-zookeeper-aws.yaml @@ -45,6 +45,9 @@ monitoring: node_exporter: false zookeeper: + configData: + # External zookeeper server list in case of global-zk list to create zk cluster across zk deployed on different clusters/namespaces + # ZOOKEEPER_SERVERS: "us-east1-pulsar-zookeeper-0.us-east1-pulsar-zookeeper.us-east1.svc.cluster.local:2888:3888,us-east1-pulsar-zookeeper-1.us-east1-pulsar-zookeeper.us-east1.svc.cluster.local:2888:3888,us-east1-pulsar-zookeeper-2.us-east1-pulsar-zookeeper.us-east1.svc.cluster.local:2888:3888,us-west1-pulsar-zookeeper-0.us-west1-pulsar-zookeeper.us-west1.svc.cluster.local:2888:3888,us-west1-pulsar-zookeeper-1.us-west1-pulsar-zookeeper.us-west1.svc.cluster.local:2888:3888,us-west1-pulsar-zookeeper-2.us-west1-pulsar-zookeeper.us-west1.svc.cluster.local:2888:3888" volumes: # use a persistent volume or emptyDir persistence: true