From d7bbe030ec56c767253392edac06463c807e4df0 Mon Sep 17 00:00:00 2001 From: zymap Date: Fri, 13 Oct 2023 16:49:51 +0800 Subject: [PATCH] Load the pulsar env as the program start options --- ### Motivation When enable tls for the zookeeper, it will write the TLS properties with PULSAR_EXTRA_OPTS as the key into the pulsar-env.sh file. The metadata tool also needs the PULSAR_EXTRA_OPTS to get the zookeeper TLS configurations. So import the PULSAR_EXTRA_OPTS into the OPTS to load the zookeeper TLS configuration. --- .../templates/bookkeeper/bookkeeper-cluster-initialize.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/pulsar/templates/bookkeeper/bookkeeper-cluster-initialize.yaml b/charts/pulsar/templates/bookkeeper/bookkeeper-cluster-initialize.yaml index ceec5c180..2f3cbfd5f 100644 --- a/charts/pulsar/templates/bookkeeper/bookkeeper-cluster-initialize.yaml +++ b/charts/pulsar/templates/bookkeeper/bookkeeper-cluster-initialize.yaml @@ -56,7 +56,7 @@ spec: {{- include "pulsar.toolset.zookeeper.tls.settings" . | nindent 12 }} {{ if and .Values.tls.enabled .Values.tls.zookeeper.enabled }} export "$(cat conf/pulsar_env.sh | xargs)"; - export "OPTS=${EXTRA_OPTS}"; + export OPTS="${PULSAR_EXTRA_OPTS} ${EXTRA_OPTS}"; env; {{- end }} bin/pulsar-metadata-tool cleanup