[dolphinscheduler] branch dev updated: [fix][deploy]fix run on kubernetes bug (#10379)

[zi...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

zihaoxiang pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git


The following commit(s) were added to refs/heads/dev by this push:
     new 5803d5c07c  [fix][deploy]fix run on kubernetes bug (#10379)
5803d5c07c is described below

commit 5803d5c07cf36a88f2e83dc757f1c576854142e0
Author: Hwting <83...@qq.com>
AuthorDate: Thu Jun 9 15:57:20 2022 +0800

     [fix][deploy]fix run on kubernetes bug (#10379)
    
    * [fix][kubernetes]fix run on kubernetes bug
    
    Fix the problem that the "REGISTRY_ZOOKEEPER_CONNECT_STRING" variable zookeeper port number is "nil"
    
    * [fix][kubernetes]fix run on kubernetes bug
    
    Fix the problem that the "REGISTRY_ZOOKEEPER_CONNECT_STRING" variable zookeeper port number is "nil"
---
 deploy/kubernetes/dolphinscheduler/templates/_helpers.tpl | 2 +-
 deploy/kubernetes/dolphinscheduler/values.yaml            | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/deploy/kubernetes/dolphinscheduler/templates/_helpers.tpl b/deploy/kubernetes/dolphinscheduler/templates/_helpers.tpl
index c2684e029a..8507f4669c 100644
--- a/deploy/kubernetes/dolphinscheduler/templates/_helpers.tpl
+++ b/deploy/kubernetes/dolphinscheduler/templates/_helpers.tpl
@@ -112,7 +112,7 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 Create a default fully qualified zookkeeper quorum.
 */}}
 {{- define "dolphinscheduler.zookeeper.quorum" -}}
-{{- $port := default "2181" (.Values.zookeeper.service.port | toString) -}}
+{{- $port := default "2181" .Values.zookeeper.service.port | toString -}}
 {{- printf "%s:%s" (include "dolphinscheduler.zookeeper.fullname" .) $port -}}
 {{- end -}}
 
diff --git a/deploy/kubernetes/dolphinscheduler/values.yaml b/deploy/kubernetes/dolphinscheduler/values.yaml
index f1dd6b0c9a..b618f1f8e1 100644
--- a/deploy/kubernetes/dolphinscheduler/values.yaml
+++ b/deploy/kubernetes/dolphinscheduler/values.yaml
@@ -52,6 +52,8 @@ externalDatabase:
 ## If not exists external registry, the zookeeper registry will be used by default.
 zookeeper:
   enabled: true
+  service:
+    port: 2181 
   fourlwCommandsWhitelist: "srvr,ruok,wchs,cons"
   persistence:
     enabled: false