fix: pulsar zookeeper reference error (#418)

(cherry picked from commit 10a85ff)
apecloud · Apr 2, 2024 · e1e0a33 · e1e0a33
1 parent f5788c1
commit e1e0a33
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/addons/pulsar-cluster/Chart.yaml b/addons/pulsar-cluster/Chart.yaml
@@ -4,7 +4,7 @@ description: A Pulsar Cluster Helm chart for KubeBlocks.
 
 type: application
 
-version: 0.8.2
+version: 0.8.3
 
 # appVersion specifies the version of the Pulsar database to be created,
 # and this value should be consistent with an existing clusterVersion.

diff --git a/addons/pulsar/Chart.yaml b/addons/pulsar/Chart.yaml
@@ -4,7 +4,7 @@ description: Apache Pulsar is an open-source, distributed messaging and streamin
 
 type: application
 
-version: 0.8.2
+version: 0.8.3
 
 # appVersion specifies the version of the Pulsar database to be created,
 # and this value should be consistent with an existing clusterVersion.

diff --git a/addons/pulsar/config/bookies-env.tpl b/addons/pulsar/config/bookies-env.tpl
@@ -30,8 +30,8 @@ PULSAR_MEM: -XX:MinRAMPercentage=25 -XX:MaxRAMPercentage=50 {{ $MaxDirectMemoryS
 # Try to get zookeeper from service reference first, if zookeeper service reference is empty, get default zookeeper componentDef in ClusterDefinition
 {{- $zk_server := "" }}
 {{- if $pulsar_zk_from_service_ref }}
-  {{- if and (index $pulsar_zk_from_service_ref.spec "endpoint") (index $pulsar_zk_from_service_ref.spec "port") }}
-     {{- $zk_server = printf "%s:%s" $pulsar_zk_from_service_ref.spec.endpoint.value $pulsar_zk_from_service_ref.spec.port.value }}
+  {{- if index $pulsar_zk_from_service_ref.spec "endpoint" }}
+     {{- $zk_server = $pulsar_zk_from_service_ref.spec.endpoint.value }}
   {{- else }}
      {{- $zk_server = printf "%s-zookeeper.%s.svc:2181" $clusterName $namespace }}
   {{- end }}

diff --git a/addons/pulsar/config/broker-env.tpl b/addons/pulsar/config/broker-env.tpl
@@ -29,8 +29,8 @@ PULSAR_MEM: -XX:MinRAMPercentage=30 -XX:MaxRAMPercentage=30 {{ $MaxDirectMemoryS
 # Try to get zookeeper from service reference first, if zookeeper service reference is empty, get default zookeeper componentDef in ClusterDefinition
 {{- $zk_server := "" }}
 {{- if $pulsar_zk_from_service_ref }}
-  {{- if and (index $pulsar_zk_from_service_ref.spec "endpoint") (index $pulsar_zk_from_service_ref.spec "port") }}
-     {{- $zk_server = printf "%s:%s" $pulsar_zk_from_service_ref.spec.endpoint.value $pulsar_zk_from_service_ref.spec.port.value }}
+  {{- if index $pulsar_zk_from_service_ref.spec "endpoint" }}
+     {{- $zk_server = $pulsar_zk_from_service_ref.spec.endpoint.value }}
   {{- else }}
      {{- $zk_server = printf "%s-zookeeper.%s.svc:2181" $clusterName $namespace }}
   {{- end }}