update

apecloud · Nov 23, 2023 · fae944c · fae944c
1 parent 9c54284
commit fae944c
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 5 deletions.
diff --git a/addons/etcd/templates/clusterdefinition.yaml b/addons/etcd/templates/clusterdefinition.yaml
@@ -80,5 +80,5 @@ spec:
   connectionCredential:
     username: root
     password: ""
-    endpoint: "$(SVC_FQDN)"
+    endpoint: "$(SVC_FQDN):$(SVC_PORT_client)"
     port: "$(SVC_PORT_client)"
diff --git a/addons/milvus/configs/milvus-user.yaml.tpl b/addons/milvus/configs/milvus-user.yaml.tpl
@@ -23,16 +23,23 @@
 
 {{- $etcd_endpoint := printf "%s-etcd-headless.%s.svc.cluster.local:2379" $clusterName $namespace }}
 {{- if $external_meta_service }}
-  {{- if and (index $external_meta_service.spec "endpoint") (index $external_meta_service.spec "port") }}
-     {{- $etcd_endpoint = printf "%s:%s" $external_meta_service.spec.endpoint.value $external_meta_service.spec.port.value }}
+  {{- if index $external_meta_service.spec "endpoint" }}
+     {{- $etcd_endpoint = printf "%s" $external_meta_service.spec.endpoint.value }}
   {{- end }}
 {{- end }}
 
 {{- $pulsar_server := printf "%s-pulsar-headless.%s.svc.cluster.local" $clusterName $namespace }}
 {{- $pulsar_port := "6650" }}
 {{- if $external_log_service }}
   {{- if index $external_log_service.spec "endpoint" }}
-     {{- $pulsar_server = printf "%s" $external_log_service.spec.endpoint.value }}
+     {{- $pulsar_endpoint := printf "%s" $external_log_service.spec.endpoint.value }}
+     {{ $parts := split $pulsar_endpoint ":" }}
+     {{- if eq (len $parts) 2 }}
+       {{- $pulsar_server = index $parts 0 }}
+       {{- $pulsar_port = index $parts 1 }}
+     {{- else if eq (len $parts) 1 }}
+       {{- $pulsar_server = index $parts 0 }}
+     {{- end }}
   {{- end }}
   {{- if index $external_log_service.spec "port" }}
      {{- $pulsar_port = printf "%s" $external_log_service.spec.port.value }}
@@ -43,7 +50,14 @@
 {{- $minio_port := "9000" }}
 {{- if $external_object_service }}
   {{- if index $external_object_service.spec "endpoint" }}
-     {{- $minio_server = printf "%s" $external_object_service.spec.endpoint.value }}
+     {{- $minio_endpoint := printf "%s" $external_object_service.spec.endpoint.value }}
+     {{ $parts := split $minio_endpoint ":" }}
+     {{- if eq (len $parts) 2 }}
+       {{- $minio_server = index $parts 0 }}
+       {{- $minio_port = index $parts 1 }}
+     {{- else if eq (len $parts) 1 }}
+       {{- $minio_server = index $parts 0 }}
+     {{- end }}
   {{- end }}
   {{- if index $external_object_service.spec "port" }}
      {{- $minio_port = printf "%s" $external_object_service.spec.port.value }}

diff --git a/addons/pulsar/templates/clusterdefinition.yaml b/addons/pulsar/templates/clusterdefinition.yaml
@@ -12,6 +12,8 @@ spec:
     httpEndpoint: "http://$(SVC_FQDN):$(SVC_PORT_http)"
     pulsarEndpoint: "pulsar://$(SVC_FQDN):$(SVC_PORT_pulsar)"
     kafkaEndpoint: "$(SVC_FQDN):$(SVC_PORT_kafka-client)"
+    endpoint: "$(SVC_FQDN):$(SVC_PORT_pulsar)"
+    port: "$(SVC_PORT_pulsar)"
   componentDefs:
     - name: pulsar-broker
       workloadType: Stateful