From 5855274b2634b33f7de3862694d36f3df94dd965 Mon Sep 17 00:00:00 2001
From: Lyle Shaw <lyle@hdu.edu.cn>
Date: Thu, 30 Jun 2022 15:43:19 +0800
Subject: [PATCH] [Fix-10652] fix docker-compose.yml (#10653)

* [Fix-10652] fix docker-compose.yml

* [Fix-10652] fix docker-stack.yml

* [Fix-10652] fix python api port in k8s config

* Update deploy/kubernetes/dolphinscheduler/templates/deployment-dolphinscheduler-api.yaml

Co-authored-by: Jiajie Zhong <zhongjiajie955@gmail.com>

* [Fix-10652] fix { { to {{

* [Fix-10652] del space between {{ and -

Co-authored-by: Jiajie Zhong <zhongjiajie955@gmail.com>
---
 deploy/docker/docker-compose.yml                           | 1 +
 deploy/docker/docker-stack.yml                             | 1 +
 .../templates/deployment-dolphinscheduler-api.yaml         | 2 ++
 .../templates/svc-dolphinscheduler-api.yaml                | 7 +++++++
 4 files changed, 11 insertions(+)

diff --git a/deploy/docker/docker-compose.yml b/deploy/docker/docker-compose.yml
index 032d4208a6..046e03070b 100644
--- a/deploy/docker/docker-compose.yml
+++ b/deploy/docker/docker-compose.yml
@@ -71,6 +71,7 @@ services:
     image: ${HUB}/dolphinscheduler-api:${TAG}
     ports:
       - "12345:12345"
+      - "25333:25333"
     profiles: ["all"]
     env_file: .env
     healthcheck:
diff --git a/deploy/docker/docker-stack.yml b/deploy/docker/docker-stack.yml
index 02ee37be02..a246a29e5a 100644
--- a/deploy/docker/docker-stack.yml
+++ b/deploy/docker/docker-stack.yml
@@ -50,6 +50,7 @@ services:
     image: apache/dolphinscheduler-api
     ports:
       - 12345:12345
+      - 25333:25333
     env_file: .env
     healthcheck:
       test: [ "CMD", "curl", "http://localhost:12345/actuator/health" ]
diff --git a/deploy/kubernetes/dolphinscheduler/templates/deployment-dolphinscheduler-api.yaml b/deploy/kubernetes/dolphinscheduler/templates/deployment-dolphinscheduler-api.yaml
index f571f8c2fa..41cf6a55ed 100644
--- a/deploy/kubernetes/dolphinscheduler/templates/deployment-dolphinscheduler-api.yaml
+++ b/deploy/kubernetes/dolphinscheduler/templates/deployment-dolphinscheduler-api.yaml
@@ -62,6 +62,8 @@ spec:
           ports:
             - containerPort: 12345
               name: "api-port"
+            - containerPort: 25333
+              name: "python-api-port"
           env:
             - name: TZ
               value: {{ .Values.timezone }}
diff --git a/deploy/kubernetes/dolphinscheduler/templates/svc-dolphinscheduler-api.yaml b/deploy/kubernetes/dolphinscheduler/templates/svc-dolphinscheduler-api.yaml
index 8d7fe80370..92445d14be 100644
--- a/deploy/kubernetes/dolphinscheduler/templates/svc-dolphinscheduler-api.yaml
+++ b/deploy/kubernetes/dolphinscheduler/templates/svc-dolphinscheduler-api.yaml
@@ -40,6 +40,13 @@ spec:
       {{- end }}
       protocol: TCP
       name: api-port
+    - port: 25333
+      targetPort: python-api-port
+      {{- if and (eq .Values.api.service.type "NodePort") .Values.api.service.nodePort }}
+      nodePort: {{ .Values.api.service.nodePort }}
+      {{- end }}
+      protocol: TCP
+      name: python-api-port
   {{- if .Values.api.service.externalIPs }}
   externalIPs:
     {{- toYaml .Values.api.service.externalIPs | nindent 4 }}