From 232a24441bbb559c18739a74abb69ecdb718e158 Mon Sep 17 00:00:00 2001
From: rockxsj <rockxsj@gmail.com>
Date: Mon, 10 Aug 2020 15:16:19 +0800
Subject: [PATCH] * add ZOOKEEPER_ROOT env in k8s deploy (#3260)

Co-authored-by: rockxsj <junjun@mgtv.com>
---
 .../templates/deployment-dolphinscheduler-api.yaml          | 6 ++++++
 .../templates/statefulset-dolphinscheduler-master.yaml      | 6 ++++++
 .../templates/statefulset-dolphinscheduler-worker.yaml      | 6 ++++++
 3 files changed, 18 insertions(+)

diff --git a/docker/kubernetes/dolphinscheduler/templates/deployment-dolphinscheduler-api.yaml b/docker/kubernetes/dolphinscheduler/templates/deployment-dolphinscheduler-api.yaml
index 51a83bcfa..92c2c7239 100644
--- a/docker/kubernetes/dolphinscheduler/templates/deployment-dolphinscheduler-api.yaml
+++ b/docker/kubernetes/dolphinscheduler/templates/deployment-dolphinscheduler-api.yaml
@@ -162,6 +162,12 @@ spec:
               {{- else }}
               value: {{ .Values.externalZookeeper.zookeeperQuorum }}
               {{- end }}
+            - name: ZOOKEEPER_ROOT
+              {{- if .Values.zookeeper.enabled }}
+              value: "/dolphinscheduler"
+              {{- else }}
+              value: {{ .Values.externalZookeeper.zookeeperRoot }}
+              {{- end }}
             - name: RESOURCE_STORAGE_TYPE
               valueFrom:
                 configMapKeyRef:
diff --git a/docker/kubernetes/dolphinscheduler/templates/statefulset-dolphinscheduler-master.yaml b/docker/kubernetes/dolphinscheduler/templates/statefulset-dolphinscheduler-master.yaml
index 0949127dd..e9dc7919c 100644
--- a/docker/kubernetes/dolphinscheduler/templates/statefulset-dolphinscheduler-master.yaml
+++ b/docker/kubernetes/dolphinscheduler/templates/statefulset-dolphinscheduler-master.yaml
@@ -228,6 +228,12 @@ spec:
               {{- else }}
               value: {{ .Values.externalZookeeper.zookeeperQuorum }}
               {{- end }}
+            - name: ZOOKEEPER_ROOT
+              {{- if .Values.zookeeper.enabled }}
+              value: "/dolphinscheduler"
+              {{- else }}
+              value: {{ .Values.externalZookeeper.zookeeperRoot }}
+              {{- end }}
             - name: RESOURCE_STORAGE_TYPE
               valueFrom:
                 configMapKeyRef:
diff --git a/docker/kubernetes/dolphinscheduler/templates/statefulset-dolphinscheduler-worker.yaml b/docker/kubernetes/dolphinscheduler/templates/statefulset-dolphinscheduler-worker.yaml
index 097f8d858..fd32a955a 100644
--- a/docker/kubernetes/dolphinscheduler/templates/statefulset-dolphinscheduler-worker.yaml
+++ b/docker/kubernetes/dolphinscheduler/templates/statefulset-dolphinscheduler-worker.yaml
@@ -225,6 +225,12 @@ spec:
               {{- else }}
               value: {{ .Values.externalZookeeper.zookeeperQuorum }}
               {{- end }}
+            - name: ZOOKEEPER_ROOT
+              {{- if .Values.zookeeper.enabled }}
+              value: "/dolphinscheduler"
+              {{- else }}
+              value: {{ .Values.externalZookeeper.zookeeperRoot }}
+              {{- end }}
             - name: RESOURCE_STORAGE_TYPE
               valueFrom:
                 configMapKeyRef:
-- 
GitLab