This is an automated email from the ASF dual-hosted git repository.
xincheng 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 dbd790ddac [Fix][CI] fix the ci error of Values.datasource.profile
(#16031)
dbd790ddac is described below
commit dbd790ddacfd66c48d8c6a2e89e2addea8ddfb1f
Author: Rick Cheng <[email protected]>
AuthorDate: Tue May 21 11:16:30 2024 +0800
[Fix][CI] fix the ci error of Values.datasource.profile (#16031)
Co-authored-by: Eric Gao <[email protected]>
---
deploy/kubernetes/dolphinscheduler/README.md | 1 +
.../configmap-dolphinscheduler-alert.yaml | 28 ++++++++++++-------
.../templates/configmap-dolphinscheduler-api.yaml | 31 +++++++++++++++-------
.../configmap-dolphinscheduler-master.yaml | 31 +++++++++++++++-------
.../deployment-dolphinscheduler-alert.yaml | 2 +-
.../templates/deployment-dolphinscheduler-api.yaml | 2 +-
.../statefulset-dolphinscheduler-master.yaml | 2 +-
.../statefulset-dolphinscheduler-worker.yaml | 2 +-
deploy/kubernetes/dolphinscheduler/values.yaml | 4 +++
9 files changed, 72 insertions(+), 31 deletions(-)
diff --git a/deploy/kubernetes/dolphinscheduler/README.md
b/deploy/kubernetes/dolphinscheduler/README.md
index ba533b6e47..c5e75ca938 100644
--- a/deploy/kubernetes/dolphinscheduler/README.md
+++ b/deploy/kubernetes/dolphinscheduler/README.md
@@ -158,6 +158,7 @@ Please refer to the [Quick Start in
Kubernetes](../../../docs/docs/en/guide/inst
| conf.common."yarn.application.status.address" | string |
`"http://ds1:%s/ws/v1/cluster/apps/%s"` | if resourcemanager HA is enabled or
not use resourcemanager, please keep the default value; If resourcemanager is
single, you only need to replace ds1 to actual resourcemanager hostname |
| conf.common."yarn.job.history.status.address" | string |
`"http://ds1:19888/ws/v1/history/mapreduce/jobs/%s"` | job history status url
when application number threshold is reached(default 10000, maybe it was set to
1000) |
| conf.common."yarn.resourcemanager.ha.rm.ids" | string |
`"192.168.xx.xx,192.168.xx.xx"` | if resourcemanager HA is enabled, please set
the HA IPs; if resourcemanager is single, keep this value empty |
+| datasource.profile | string | `"postgresql"` | The profile of datasource |
| externalDatabase.database | string | `"dolphinscheduler"` | The database of
external database |
| externalDatabase.driverClassName | string | `"org.postgresql.Driver"` | The
driverClassName of external database |
| externalDatabase.enabled | bool | `false` | If exists external database, and
set postgresql.enable value to false. external database will be used, otherwise
Dolphinscheduler's internal database will be used. |
diff --git
a/deploy/kubernetes/dolphinscheduler/templates/configmap-dolphinscheduler-alert.yaml
b/deploy/kubernetes/dolphinscheduler/templates/configmap-dolphinscheduler-alert.yaml
index 268c78bc4e..fd89c1ed15 100644
---
a/deploy/kubernetes/dolphinscheduler/templates/configmap-dolphinscheduler-alert.yaml
+++
b/deploy/kubernetes/dolphinscheduler/templates/configmap-dolphinscheduler-alert.yaml
@@ -33,15 +33,13 @@ data:
banner:
charset: UTF-8
datasource:
- profile: postgresql
- config:
- driver-class-name: org.postgresql.Driver
- url: jdbc:postgresql://127.0.0.1:5432/dolphinscheduler
- username: root
- password: root
- hikari:
- connection-test-query: select 1
- pool-name: DolphinScheduler
+ driver-class-name: org.postgresql.Driver
+ url: jdbc:postgresql://127.0.0.1:5432/dolphinscheduler
+ username: root
+ password: root
+ hikari:
+ connection-test-query: select 1
+ pool-name: DolphinScheduler
# Mybatis-plus configuration, you don't need to change it
mybatis-plus:
@@ -102,4 +100,16 @@ data:
metrics:
enabled: true
+
+ # Override by profile
+ ---
+ spring:
+ config:
+ activate:
+ on-profile: mysql
+ datasource:
+ driver-class-name: com.mysql.cj.jdbc.Driver
+ url: jdbc:mysql://127.0.0.1:3306/dolphinscheduler
+ username: root
+ password: root
{{- end }}
diff --git
a/deploy/kubernetes/dolphinscheduler/templates/configmap-dolphinscheduler-api.yaml
b/deploy/kubernetes/dolphinscheduler/templates/configmap-dolphinscheduler-api.yaml
index 7570f9b010..f115490c31 100644
---
a/deploy/kubernetes/dolphinscheduler/templates/configmap-dolphinscheduler-api.yaml
+++
b/deploy/kubernetes/dolphinscheduler/templates/configmap-dolphinscheduler-api.yaml
@@ -54,15 +54,13 @@ data:
messages:
basename: i18n/messages
datasource:
- profile: postgresql
- config:
- driver-class-name: org.postgresql.Driver
- url: jdbc:postgresql://127.0.0.1:5432/dolphinscheduler
- username: root
- password: root
- hikari:
- connection-test-query: select 1
- pool-name: DolphinScheduler
+ driver-class-name: org.postgresql.Driver
+ url: jdbc:postgresql://127.0.0.1:5432/dolphinscheduler
+ username: root
+ password: root
+ hikari:
+ connection-test-query: select 1
+ pool-name: DolphinScheduler
quartz:
auto-startup: false
job-store-type: jdbc
@@ -239,6 +237,21 @@ data:
application-name: ""
# Doplhinscheduler login url
redirect-url: ""
+
+ # Override by profile
+ ---
+ spring:
+ config:
+ activate:
+ on-profile: mysql
+ datasource:
+ driver-class-name: com.mysql.cj.jdbc.Driver
+ url: jdbc:mysql://127.0.0.1:3306/dolphinscheduler
+ username: root
+ password: root
+ quartz:
+ properties:
+ org.quartz.jobStore.driverDelegateClass:
org.quartz.impl.jdbcjobstore.StdJDBCDelegate
{{- end }}
diff --git
a/deploy/kubernetes/dolphinscheduler/templates/configmap-dolphinscheduler-master.yaml
b/deploy/kubernetes/dolphinscheduler/templates/configmap-dolphinscheduler-master.yaml
index 07e8352f0d..0a2c8bf2a4 100644
---
a/deploy/kubernetes/dolphinscheduler/templates/configmap-dolphinscheduler-master.yaml
+++
b/deploy/kubernetes/dolphinscheduler/templates/configmap-dolphinscheduler-master.yaml
@@ -33,15 +33,13 @@ data:
time-zone: UTC
date-format: "yyyy-MM-dd HH:mm:ss"
datasource:
- profile: postgresql
- config:
- driver-class-name: org.postgresql.Driver
- url: jdbc:postgresql://127.0.0.1:5432/dolphinscheduler
- username: root
- password: root
- hikari:
- connection-test-query: select 1
- pool-name: DolphinScheduler
+ driver-class-name: org.postgresql.Driver
+ url: jdbc:postgresql://127.0.0.1:5432/dolphinscheduler
+ username: root
+ password: root
+ hikari:
+ connection-test-query: select 1
+ pool-name: DolphinScheduler
quartz:
job-store-type: jdbc
jdbc:
@@ -157,4 +155,19 @@ data:
metrics:
enabled: true
+
+ # Override by profile
+ ---
+ spring:
+ config:
+ activate:
+ on-profile: mysql
+ datasource:
+ driver-class-name: com.mysql.cj.jdbc.Driver
+ url: jdbc:mysql://127.0.0.1:3306/dolphinscheduler
+ username: root
+ password: root
+ quartz:
+ properties:
+ org.quartz.jobStore.driverDelegateClass:
org.quartz.impl.jdbcjobstore.StdJDBCDelegate
{{- end }}
diff --git
a/deploy/kubernetes/dolphinscheduler/templates/deployment-dolphinscheduler-alert.yaml
b/deploy/kubernetes/dolphinscheduler/templates/deployment-dolphinscheduler-alert.yaml
index 84f28f484b..6a5560b3d4 100644
---
a/deploy/kubernetes/dolphinscheduler/templates/deployment-dolphinscheduler-alert.yaml
+++
b/deploy/kubernetes/dolphinscheduler/templates/deployment-dolphinscheduler-alert.yaml
@@ -131,5 +131,5 @@ spec:
name: {{ include "dolphinscheduler.fullname" . }}-configs
- name: alert-config-volume
configMap:
- name: { { include "dolphinscheduler.fullname" . } }-alert
+ name: {{ include "dolphinscheduler.fullname" . }}-alert
{{- end }}
diff --git
a/deploy/kubernetes/dolphinscheduler/templates/deployment-dolphinscheduler-api.yaml
b/deploy/kubernetes/dolphinscheduler/templates/deployment-dolphinscheduler-api.yaml
index 0b359f15c8..f36d2442ae 100644
---
a/deploy/kubernetes/dolphinscheduler/templates/deployment-dolphinscheduler-api.yaml
+++
b/deploy/kubernetes/dolphinscheduler/templates/deployment-dolphinscheduler-api.yaml
@@ -141,7 +141,7 @@ spec:
name: {{ include "dolphinscheduler.fullname" . }}-configs
- name: api-config-volume
configMap:
- name: { { include "dolphinscheduler.fullname" . } }-api
+ name: {{ include "dolphinscheduler.fullname" . }}-api
{{- include "dolphinscheduler.sharedStorage.volume" . | nindent 8 }}
{{- include "dolphinscheduler.fsFileResource.volume" . | nindent 8 }}
{{- include "dolphinscheduler.ldap.ssl.volume" . | nindent 8 }}
diff --git
a/deploy/kubernetes/dolphinscheduler/templates/statefulset-dolphinscheduler-master.yaml
b/deploy/kubernetes/dolphinscheduler/templates/statefulset-dolphinscheduler-master.yaml
index a93621b7f2..1d9d517d0e 100644
---
a/deploy/kubernetes/dolphinscheduler/templates/statefulset-dolphinscheduler-master.yaml
+++
b/deploy/kubernetes/dolphinscheduler/templates/statefulset-dolphinscheduler-master.yaml
@@ -127,7 +127,7 @@ spec:
{{- end }}
- name: master-config-volume
configMap:
- name: { { include "dolphinscheduler.fullname" . } }-master
+ name: {{ include "dolphinscheduler.fullname" . }}-master
{{- include "dolphinscheduler.sharedStorage.volume" . | nindent 8 }}
- name: config-volume
configMap:
diff --git
a/deploy/kubernetes/dolphinscheduler/templates/statefulset-dolphinscheduler-worker.yaml
b/deploy/kubernetes/dolphinscheduler/templates/statefulset-dolphinscheduler-worker.yaml
index 83ce8947dd..8d55be6f70 100644
---
a/deploy/kubernetes/dolphinscheduler/templates/statefulset-dolphinscheduler-worker.yaml
+++
b/deploy/kubernetes/dolphinscheduler/templates/statefulset-dolphinscheduler-worker.yaml
@@ -144,7 +144,7 @@ spec:
{{- end }}
- name: worker-config-volume
configMap:
- name: { { include "dolphinscheduler.fullname" . } }-worker
+ name: {{ include "dolphinscheduler.fullname" . }}-worker
- name: config-volume
configMap:
name: {{ include "dolphinscheduler.fullname" . }}-configs
diff --git a/deploy/kubernetes/dolphinscheduler/values.yaml
b/deploy/kubernetes/dolphinscheduler/values.yaml
index 7a04ff5604..61b6f0def2 100644
--- a/deploy/kubernetes/dolphinscheduler/values.yaml
+++ b/deploy/kubernetes/dolphinscheduler/values.yaml
@@ -49,6 +49,10 @@ image:
# -- tools image
tools: dolphinscheduler-tools
+datasource:
+ # -- The profile of datasource
+ profile: postgresql
+
postgresql:
# -- If not exists external PostgreSQL, by default, the DolphinScheduler
will use a internal PostgreSQL
enabled: true
