You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by ca...@apache.org on 2022/06/30 07:43:32 UTC
[dolphinscheduler] branch dev updated: [Fix-10652] fix docker-compose.yml (#10653)
This is an automated email from the ASF dual-hosted git repository.
caishunfeng 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 5855274b26 [Fix-10652] fix docker-compose.yml (#10653)
5855274b26 is described below
commit 5855274b2634b33f7de3862694d36f3df94dd965
Author: Lyle Shaw <ly...@hdu.edu.cn>
AuthorDate: Thu Jun 30 15:43:19 2022 +0800
[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 <zh...@gmail.com>
* [Fix-10652] fix { { to {{
* [Fix-10652] del space between {{ and -
Co-authored-by: Jiajie Zhong <zh...@gmail.com>
---
deploy/docker/docker-compose.yml | 1 +
deploy/docker/docker-stack.yml | 1 +
.../templates/deployment-dolphinscheduler-api.yaml | 2 ++
.../dolphinscheduler/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 }}