Skip to content

Commit 69b3536

Browse files
authored
[Improvement-18161][Pom] Does not support automatic hot-reloading of configuration files from ConfigMap (#18162)
1 parent f80a62e commit 69b3536

18 files changed

Lines changed: 10 additions & 201 deletions

File tree

docs/docs/en/architecture/configuration.md

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ The directory structure of DolphinScheduler is as follows:
2828
│   │   └── jvm_args_env.sh script to set JVM args of DolphinScheduler alert-server
2929
│   ├── conf
3030
│   │   ├── application.yaml configurations of alert-server
31-
│   │   ├── bootstrap.yaml configurations for Spring Cloud bootstrap, mostly you don't need to modify this,
3231
│   │   ├── common.properties configurations of common-service like storage, credentials, etc.
3332
│   │   ├── dolphinscheduler_env.sh script to load environment variables for alert-server
3433
│   │   └── logback-spring.xml configurations of alert-service log
@@ -40,7 +39,6 @@ The directory structure of DolphinScheduler is as follows:
4039
│   │   └── jvm_args_env.sh script to set JVM args of DolphinScheduler api-server
4140
│   ├── conf
4241
│   │   ├── application.yaml configurations of api-server
43-
│   │   ├── bootstrap.yaml configurations for Spring Cloud bootstrap, mostly you don't need to modify this,
4442
│   │   ├── common.properties configurations of common-service like storage, credentials, etc.
4543
│   │   ├── dolphinscheduler_env.sh script to load environment variables for api-server
4644
│   │   └── logback-spring.xml configurations of api-service log
@@ -53,7 +51,6 @@ The directory structure of DolphinScheduler is as follows:
5351
│   │   └── jvm_args_env.sh script to set JVM args of DolphinScheduler master-server
5452
│   ├── conf
5553
│   │   ├── application.yaml configurations of master-server
56-
│   │   ├── bootstrap.yaml configurations for Spring Cloud bootstrap, mostly you don't need to modify this,
5754
│   │   ├── common.properties configurations of common-service like storage, credentials, etc.
5855
│   │   ├── dolphinscheduler_env.sh script to load environment variables for master-server
5956
│   │   └── logback-spring.xml configurations of master-service log
@@ -65,7 +62,6 @@ The directory structure of DolphinScheduler is as follows:
6562
│   │   └── jvm_args_env.sh script to set JVM args of DolphinScheduler standalone-server
6663
│   ├── conf
6764
│   │   ├── application.yaml configurations of standalone-server
68-
│   │   ├── bootstrap.yaml configurations for Spring Cloud bootstrap, mostly you don't need to modify this,
6965
│   │   ├── common.properties configurations of common-service like storage, credentials, etc.
7066
│   │   ├── dolphinscheduler_env.sh script to load environment variables for standalone-server
7167
│   │   ├── logback-spring.xml configurations of standalone-service log
@@ -88,7 +84,6 @@ The directory structure of DolphinScheduler is as follows:
8884
│   │   └── jvm_args_env.sh script to set JVM args of DolphinScheduler worker-server
8985
│   ├── conf
9086
│   │   ├── application.yaml configurations of worker-server
91-
│   │   ├── bootstrap.yaml configurations for Spring Cloud bootstrap, mostly you don't need to modify this,
9287
│   │   ├── common.properties configurations of common-service like storage, credentials, etc.
9388
│   │   ├── dolphinscheduler_env.sh script to load environment variables for worker-server
9489
│   │   └── logback-spring.xml configurations of worker-service log

docs/docs/zh/architecture/configuration.md

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ DolphinScheduler的目录结构如下:
2626
│   │   └── jvm_args_env.sh DolphinScheduler alert-server jvm参数配置脚本
2727
│   ├── conf
2828
│   │   ├── application.yaml alert-server配置文件
29-
│   │   ├── bootstrap.yaml Spring Cloud 启动阶段配置文件, 通常不需要修改
3029
│   │   ├── common.properties 公共服务(存储等信息)配置文件
3130
│   │   ├── dolphinscheduler_env.sh alert-server环境变量配置加载脚本
3231
│   │   └── logback-spring.xml alert-service日志配置文件
@@ -38,7 +37,6 @@ DolphinScheduler的目录结构如下:
3837
│   │   └── jvm_args_env.sh DolphinScheduler api-server jvm参数配置脚本
3938
│   ├── conf
4039
│   │   ├── application.yaml api-server配置文件
41-
│   │   ├── bootstrap.yaml Spring Cloud 启动阶段配置文件, 通常不需要修改
4240
│   │   ├── common.properties 公共服务(存储等信息)配置文件
4341
│   │   ├── dolphinscheduler_env.sh api-server环境变量配置加载脚本
4442
│   │   └── logback-spring.xml api-service日志配置文件
@@ -51,7 +49,6 @@ DolphinScheduler的目录结构如下:
5149
│   │   └── jvm_args_env.sh DolphinScheduler master-server jvm参数配置脚本
5250
│   ├── conf
5351
│   │   ├── application.yaml master-server配置文件
54-
│   │   ├── bootstrap.yaml Spring Cloud 启动阶段配置文件, 通常不需要修改
5552
│   │   ├── common.properties 公共服务(存储等信息)配置文件
5653
│   │   ├── dolphinscheduler_env.sh master-server环境变量配置加载脚本
5754
│   │   └── logback-spring.xml master-service日志配置文件
@@ -63,7 +60,6 @@ DolphinScheduler的目录结构如下:
6360
│   │   └── jvm_args_env.sh DolphinScheduler standalone-server jvm参数配置脚本
6461
│   ├── conf
6562
│   │   ├── application.yaml standalone-server配置文件
66-
│   │   ├── bootstrap.yaml Spring Cloud 启动阶段配置文件, 通常不需要修改
6763
│   │   ├── common.properties 公共服务(存储等信息)配置文件
6864
│   │   ├── dolphinscheduler_env.sh standalone-server环境变量配置加载脚本
6965
│   │   ├── logback-spring.xml standalone-service日志配置文件
@@ -88,7 +84,6 @@ DolphinScheduler的目录结构如下:
8884
│   │   └── jvm_args_env.sh DolphinScheduler worker-server jvm参数配置脚本
8985
│   ├── conf
9086
│   │   ├── application.yaml worker-server配置文件
91-
│   │   ├── bootstrap.yaml Spring Cloud 启动阶段配置文件, 通常不需要修改
9287
│   │   ├── common.properties 公共服务(存储等信息)配置文件
9388
│   │   ├── dolphinscheduler_env.sh worker-server环境变量配置加载脚本
9489
│   │   └── logback-spring.xml worker-service日志配置文件

dolphinscheduler-alert/dolphinscheduler-alert-server/pom.xml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -79,11 +79,6 @@
7979
<artifactId>janino</artifactId>
8080
</dependency>
8181

82-
<dependency>
83-
<groupId>org.springframework.cloud</groupId>
84-
<artifactId>spring-cloud-starter-kubernetes-client-config</artifactId>
85-
</dependency>
86-
8782
<dependency>
8883
<groupId>org.springframework.boot</groupId>
8984
<artifactId>spring-boot-starter-test</artifactId>

dolphinscheduler-alert/dolphinscheduler-alert-server/src/main/resources/application.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
#
1717

1818
spring:
19+
application:
20+
name: alert-server
1921
profiles:
2022
active: postgresql
2123
jackson:

dolphinscheduler-alert/dolphinscheduler-alert-server/src/main/resources/bootstrap.yaml

Lines changed: 0 additions & 28 deletions
This file was deleted.

dolphinscheduler-api/pom.xml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -232,11 +232,6 @@
232232
<artifactId>spring-ldap-core</artifactId>
233233
</dependency>
234234

235-
<dependency>
236-
<groupId>org.springframework.cloud</groupId>
237-
<artifactId>spring-cloud-starter-kubernetes-client-config</artifactId>
238-
</dependency>
239-
240235
<dependency>
241236
<groupId>org.casbin</groupId>
242237
<artifactId>casdoor-spring-boot-starter</artifactId>

dolphinscheduler-api/src/main/resources/application.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ server:
3131
custom-format: '%{client}a - %u %t "%r" %s %O %{ms}Tms'
3232

3333
spring:
34+
application:
35+
name: api-server
3436
profiles:
3537
active: postgresql
3638
banner:

dolphinscheduler-api/src/main/resources/bootstrap.yaml

Lines changed: 0 additions & 28 deletions
This file was deleted.

dolphinscheduler-dist/release-docs/LICENSE

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -285,12 +285,7 @@ The text of each license is also included at licenses/LICENSE-[project].txt.
285285
oshi-core 6.1.1: https://mvnrepository.com/artifact/com.github.oshi/oshi-core/6.1.1, MIT
286286
classgraph 4.8.147: https://mvnrepository.com/artifact/io.github.classgraph/classgraph/4.8.147, MIT
287287
bcpkix-jdk15on 1.67: https://mvnrepository.com/artifact/org.bouncycastle/bcpkix-jdk15on/1.67, MIT
288-
bcpkix-jdk15on 1.69: https://mvnrepository.com/artifact/org.bouncycastle/bcpkix-jdk15on/1.69, MIT
289288
bcprov-jdk15on 1.67: https://mvnrepository.com/artifact/org.bouncycastle/bcprov-jdk15on/1.67, MIT
290-
bcprov-jdk15on 1.69: https://mvnrepository.com/artifact/org.bouncycastle/bcprov-jdk15on/1.69, MIT
291-
bcprov-ext-jdk15on 1.69: https://mvnrepository.com/artifact/org.bouncycastle/bcprov-ext-jdk15on, MIT
292-
bcutil-jdk15on 1.69: https://mvnrepository.com/artifact/org.bouncycastle/bcutil-jdk15on, MIT
293-
gson-fire 1.8.5: https://mvnrepository.com/artifact/io.gsonfire/gson-fire/1.8.5, MIT
294289
reactive-streams 1.0.4: https://mvnrepository.com/artifact/org.reactivestreams/reactive-streams/1.0.4, MIT
295290
webjars-locator-core 0.50: https://mvnrepository.com/artifact/org.webjars/webjars-locator-core/0.50, MIT
296291
azure-core 1.36.0: https://mvnrepository.com/artifact/com.azure/azure-core/1.36.0, MIT

dolphinscheduler-master/pom.xml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -342,12 +342,6 @@
342342
<artifactId>brace-expansion</artifactId>
343343
</dependency>
344344

345-
<!-- TODO: Have to use spring-cloud-starter-kubernetes-fabric8-config after upgrading to Spring 3.x to unify kubernetes client (fabric8) -->
346-
<dependency>
347-
<groupId>org.springframework.cloud</groupId>
348-
<artifactId>spring-cloud-starter-kubernetes-client-config</artifactId>
349-
</dependency>
350-
351345
<dependency>
352346
<groupId>org.apache.dolphinscheduler</groupId>
353347
<artifactId>dolphinscheduler-actuator-authentication</artifactId>

0 commit comments

Comments
 (0)