Browse Source

Add Kubernetes configmap reload to all components (#11730)

3.1.0-release
kezhenxu94 2 years ago committed by GitHub
parent
commit
277f137358
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 5
      docs/docs/en/architecture/configuration.md
  2. 5
      docs/docs/zh/architecture/configuration.md
  3. 13
      dolphinscheduler-alert/dolphinscheduler-alert-server/pom.xml
  4. 2
      dolphinscheduler-alert/dolphinscheduler-alert-server/src/main/resources/application.yaml
  5. 28
      dolphinscheduler-alert/dolphinscheduler-alert-server/src/main/resources/bootstrap.yaml
  6. 5
      dolphinscheduler-api/pom.xml
  7. 2
      dolphinscheduler-api/src/main/resources/application.yaml
  8. 28
      dolphinscheduler-api/src/main/resources/bootstrap.yaml
  9. 2
      dolphinscheduler-dist/release-docs/LICENSE
  10. 15
      dolphinscheduler-log-server/src/main/java/org/apache/dolphinscheduler/server/log/LoggerRequestProcessor.java
  11. 58
      dolphinscheduler-master/pom.xml
  12. 2
      dolphinscheduler-master/src/main/resources/application.yaml
  13. 28
      dolphinscheduler-master/src/main/resources/bootstrap.yaml
  14. 4
      dolphinscheduler-standalone-server/pom.xml
  15. 2
      dolphinscheduler-standalone-server/src/main/resources/application.yaml
  16. 28
      dolphinscheduler-standalone-server/src/main/resources/bootstrap.yaml
  17. 35
      dolphinscheduler-worker/pom.xml
  18. 2
      dolphinscheduler-worker/src/main/resources/application.yaml
  19. 28
      dolphinscheduler-worker/src/main/resources/bootstrap.yaml
  20. 11
      tools/dependencies/known-dependencies.txt

5
docs/docs/en/architecture/configuration.md

@ -34,6 +34,7 @@ The directory structure of DolphinScheduler is as follows:
     └── start.sh script to start DolphinScheduler alert-server
   ├── conf
     ├── application.yaml configurations of alert-server
     ├── bootstrap.yaml configurations for Spring Cloud bootstrap, mostly you don't need to modify this,
     ├── common.properties configurations of common-service like storage, credentials, etc.
     ├── dolphinscheduler_env.sh script to load environment variables for alert-server
     └── logback-spring.xml configurations of alert-service log
@ -44,6 +45,7 @@ The directory structure of DolphinScheduler is as follows:
     └── start.sh script to start DolphinScheduler api-server
   ├── conf
     ├── application.yaml configurations of api-server
     ├── bootstrap.yaml configurations for Spring Cloud bootstrap, mostly you don't need to modify this,
     ├── common.properties configurations of common-service like storage, credentials, etc.
     ├── dolphinscheduler_env.sh script to load environment variables for api-server
     └── logback-spring.xml configurations of api-service log
@ -55,6 +57,7 @@ The directory structure of DolphinScheduler is as follows:
     └── start.sh script to start DolphinScheduler master-server
   ├── conf
     ├── application.yaml configurations of master-server
     ├── bootstrap.yaml configurations for Spring Cloud bootstrap, mostly you don't need to modify this,
     ├── common.properties configurations of common-service like storage, credentials, etc.
     ├── dolphinscheduler_env.sh script to load environment variables for master-server
     └── logback-spring.xml configurations of master-service log
@ -65,6 +68,7 @@ The directory structure of DolphinScheduler is as follows:
     └── start.sh script to start DolphinScheduler standalone-server
   ├── conf
     ├── application.yaml configurations of standalone-server
     ├── bootstrap.yaml configurations for Spring Cloud bootstrap, mostly you don't need to modify this,
     ├── common.properties configurations of common-service like storage, credentials, etc.
     ├── dolphinscheduler_env.sh script to load environment variables for standalone-server
     ├── logback-spring.xml configurations of standalone-service log
@ -86,6 +90,7 @@ The directory structure of DolphinScheduler is as follows:
│ │   └── start.sh script to start DolphinScheduler worker-server
│ ├── conf
│ │   ├── application.yaml configurations of worker-server
│ │   ├── bootstrap.yaml configurations for Spring Cloud bootstrap, mostly you don't need to modify this,
│ │   ├── common.properties configurations of common-service like storage, credentials, etc.
│ │   ├── dolphinscheduler_env.sh script to load environment variables for worker-server
│ │   └── logback-spring.xml configurations of worker-service log

5
docs/docs/zh/architecture/configuration.md

@ -30,6 +30,7 @@ DolphinScheduler的目录结构如下:
     └── start.sh DolphinScheduler alert-server启动脚本
   ├── conf
     ├── application.yaml alert-server配置文件
     ├── bootstrap.yaml Spring Cloud 启动阶段配置文件, 通常不需要修改
     ├── common.properties 公共服务(存储等信息)配置文件
     ├── dolphinscheduler_env.sh alert-server环境变量配置加载脚本
     └── logback-spring.xml alert-service日志配置文件
@ -40,6 +41,7 @@ DolphinScheduler的目录结构如下:
     └── start.sh DolphinScheduler api-server启动脚本
   ├── conf
     ├── application.yaml api-server配置文件
     ├── bootstrap.yaml Spring Cloud 启动阶段配置文件, 通常不需要修改
     ├── common.properties 公共服务(存储等信息)配置文件
     ├── dolphinscheduler_env.sh api-server环境变量配置加载脚本
     └── logback-spring.xml api-service日志配置文件
@ -51,6 +53,7 @@ DolphinScheduler的目录结构如下:
     └── start.sh DolphinScheduler master-server启动脚本
   ├── conf
     ├── application.yaml master-server配置文件
     ├── bootstrap.yaml Spring Cloud 启动阶段配置文件, 通常不需要修改
     ├── common.properties 公共服务(存储等信息)配置文件
     ├── dolphinscheduler_env.sh master-server环境变量配置加载脚本
     └── logback-spring.xml master-service日志配置文件
@ -61,6 +64,7 @@ DolphinScheduler的目录结构如下:
     └── start.sh DolphinScheduler standalone-server启动脚本
   ├── conf
     ├── application.yaml standalone-server配置文件
     ├── bootstrap.yaml Spring Cloud 启动阶段配置文件, 通常不需要修改
     ├── common.properties 公共服务(存储等信息)配置文件
     ├── dolphinscheduler_env.sh standalone-server环境变量配置加载脚本
     ├── logback-spring.xml standalone-service日志配置文件
@ -82,6 +86,7 @@ DolphinScheduler的目录结构如下:
│ │   └── start.sh DolphinScheduler worker-server启动脚本
│ ├── conf
│ │   ├── application.yaml worker-server配置文件
│ │   ├── bootstrap.yaml Spring Cloud 启动阶段配置文件, 通常不需要修改
│ │   ├── common.properties 公共服务(存储等信息)配置文件
│ │   ├── dolphinscheduler_env.sh worker-server环境变量配置加载脚本
│ │   └── logback-spring.xml worker-service日志配置文件

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

@ -15,8 +15,7 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@ -25,8 +24,8 @@
<version>dev-SNAPSHOT</version>
</parent>
<artifactId>dolphinscheduler-alert-server</artifactId>
<name>${project.artifactId}</name>
<packaging>jar</packaging>
<name>${project.artifactId}</name>
<dependencies>
<!-- dolphinscheduler -->
@ -93,6 +92,12 @@
<groupId>org.codehaus.janino</groupId>
<artifactId>janino</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-kubernetes-fabric8-config</artifactId>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
@ -123,10 +128,10 @@
<executions>
<execution>
<id>dolphinscheduler-alert-server</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<phase>package</phase>
<configuration>
<finalName>alert-server</finalName>
<descriptors>

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

@ -16,8 +16,6 @@
#
spring:
application:
name: alert-server
jackson:
time-zone: UTC
date-format: "yyyy-MM-dd HH:mm:ss"

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

@ -0,0 +1,28 @@
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
# The ASF licenses this file to You under the Apache License, Version 2.0
# (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
spring:
application:
name: alert-server
cloud:
kubernetes:
reload:
enabled: true
mode: event
config:
sources:
- name: ${spring.application.name}

5
dolphinscheduler-api/pom.xml

@ -181,6 +181,11 @@
<artifactId>spring-ldap</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-kubernetes-fabric8-config</artifactId>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>

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

@ -28,8 +28,6 @@ server:
max-http-form-post-size: 5000000
spring:
application:
name: api-server
banner:
charset: UTF-8
jackson:

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

@ -0,0 +1,28 @@
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
# The ASF licenses this file to You under the Apache License, Version 2.0
# (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
spring:
application:
name: api-server
cloud:
kubernetes:
reload:
enabled: true
mode: event
config:
sources:
- name: ${spring.application.name}

2
dolphinscheduler-dist/release-docs/LICENSE vendored

@ -521,6 +521,8 @@ The text of each license is also included at licenses/LICENSE-[project].txt.
oshi-core 6.1.1: https://mvnrepository.com/artifact/com.github.oshi/oshi-core/6.1.1, MIT
unirest-java 3.7.04-standalone: https://mvnrepository.com/artifact/com.konghq/unirest-java/3.7.04, MIT
classgraph 4.8.83: https://mvnrepository.com/artifact/io.github.classgraph/classgraph, MIT
bcpkix-jdk15on 1.68: https://mvnrepository.com/artifact/org.bouncycastle/bcpkix-jdk15on MIT
bcprov-jdk15on 1.68: https://mvnrepository.com/artifact/org.bouncycastle/bcprov-jdk15on MIT
========================================================================
MPL 1.1 licenses

15
dolphinscheduler-log-server/src/main/java/org/apache/dolphinscheduler/server/log/LoggerRequestProcessor.java

@ -59,8 +59,6 @@ import org.springframework.stereotype.Component;
import io.netty.channel.Channel;
import com.google.common.util.concurrent.ThreadFactoryBuilder;
/**
* logger request process logic
*/
@ -80,7 +78,7 @@ public class LoggerRequestProcessor implements NettyRequestProcessor {
public void process(Channel channel, Command command) {
logger.info("received command : {}", command);
//request task log command type
// request task log command type
final CommandType commandType = command.getType();
switch (commandType) {
case GET_LOG_BYTES_REQUEST:
@ -120,7 +118,7 @@ public class LoggerRequestProcessor implements NettyRequestProcessor {
final int MaxResponseLogSize = 65535;
int totalLogByteSize = 0;
for (String line : lines) {
//If a single line of log is exceed max response size, cut off the line
// If a single line of log is exceed max response size, cut off the line
final int lineByteSize = line.getBytes(StandardCharsets.UTF_8).length;
if (lineByteSize >= MaxResponseLogSize) {
builder.append(line, 0, MaxResponseLogSize)
@ -136,7 +134,8 @@ public class LoggerRequestProcessor implements NettyRequestProcessor {
break;
}
}
RollViewLogResponseCommand rollViewLogRequestResponse = new RollViewLogResponseCommand(builder.toString());
RollViewLogResponseCommand rollViewLogRequestResponse =
new RollViewLogResponseCommand(builder.toString());
channel.writeAndFlush(rollViewLogRequestResponse.convert2Command(command.getOpaque()));
break;
case REMOVE_TAK_LOG_REQUEST:
@ -161,7 +160,8 @@ public class LoggerRequestProcessor implements NettyRequestProcessor {
channel.writeAndFlush(removeTaskLogResponse.convert2Command(command.getOpaque()));
break;
case GET_APP_ID_REQUEST:
GetAppIdRequestCommand getAppIdRequestCommand = JSONUtils.parseObject(command.getBody(), GetAppIdRequestCommand.class);
GetAppIdRequestCommand getAppIdRequestCommand =
JSONUtils.parseObject(command.getBody(), GetAppIdRequestCommand.class);
String logPath = getAppIdRequestCommand.getLogPath();
if (!checkPathSecurity(logPath)) {
throw new IllegalArgumentException("Illegal path");
@ -203,7 +203,8 @@ public class LoggerRequestProcessor implements NettyRequestProcessor {
* @return byte array of file
*/
private byte[] getFileContentBytes(String filePath) {
try (InputStream in = new FileInputStream(filePath);
try (
InputStream in = new FileInputStream(filePath);
ByteArrayOutputStream bos = new ByteArrayOutputStream()) {
byte[] buf = new byte[1024];
int len;

58
dolphinscheduler-master/pom.xml

@ -18,18 +18,29 @@
~ under the License.
~
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>dolphinscheduler</artifactId>
<groupId>org.apache.dolphinscheduler</groupId>
<artifactId>dolphinscheduler</artifactId>
<version>dev-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>dolphinscheduler-master</artifactId>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.apache.dolphinscheduler</groupId>
<artifactId>dolphinscheduler-bom</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
<dependency>
<groupId>org.apache.dolphinscheduler</groupId>
@ -66,12 +77,12 @@
<artifactId>spring-boot-starter-cache</artifactId>
<exclusions>
<exclusion>
<artifactId>log4j-api</artifactId>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
</exclusion>
<exclusion>
<artifactId>log4j-to-slf4j</artifactId>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-to-slf4j</artifactId>
</exclusion>
</exclusions>
</dependency>
@ -93,8 +104,8 @@
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
<exclusion>
<artifactId>servlet-api</artifactId>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</exclusion>
<exclusion>
<groupId>org.codehaus.jackson</groupId>
@ -118,20 +129,20 @@
<artifactId>hadoop-mapreduce-client-shuffle</artifactId>
</exclusion>
<exclusion>
<artifactId>jersey-client</artifactId>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-client</artifactId>
</exclusion>
<exclusion>
<artifactId>jersey-core</artifactId>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-core</artifactId>
</exclusion>
<exclusion>
<artifactId>jaxb-api</artifactId>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</exclusion>
<exclusion>
<artifactId>log4j</artifactId>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
</exclusions>
</dependency>
@ -149,8 +160,8 @@
<artifactId>jdk.tools</artifactId>
</exclusion>
<exclusion>
<artifactId>servlet-api</artifactId>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</exclusion>
<exclusion>
<groupId>javax.servlet</groupId>
@ -214,16 +225,16 @@
<artifactId>jsp-api</artifactId>
</exclusion>
<exclusion>
<artifactId>jersey-json</artifactId>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-json</artifactId>
</exclusion>
<exclusion>
<artifactId>jersey-server</artifactId>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-server</artifactId>
</exclusion>
<exclusion>
<artifactId>jersey-core</artifactId>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-core</artifactId>
</exclusion>
</exclusions>
</dependency>
@ -240,25 +251,20 @@
<dependency>
<groupId>org.apache.dolphinscheduler</groupId>
<artifactId>dolphinscheduler-worker</artifactId>
<scope>test</scope> <!-- master should never depend on worker, this is only for tests -->
<scope>test</scope>
<!-- master should never depend on worker, this is only for tests -->
</dependency>
<dependency>
<groupId>org.apache.dolphinscheduler</groupId>
<artifactId>dolphinscheduler-log-server</artifactId>
</dependency>
</dependencies>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.apache.dolphinscheduler</groupId>
<artifactId>dolphinscheduler-bom</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>import</scope>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-kubernetes-fabric8-config</artifactId>
</dependency>
</dependencies>
</dependencyManagement>
<build>
<plugins>
@ -278,10 +284,10 @@
<executions>
<execution>
<id>dolphinscheduler-master-server</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<phase>package</phase>
<configuration>
<finalName>master-server</finalName>
<descriptors>

2
dolphinscheduler-master/src/main/resources/application.yaml

@ -17,8 +17,6 @@
spring:
banner:
charset: UTF-8
application:
name: master-server
jackson:
time-zone: UTC
date-format: "yyyy-MM-dd HH:mm:ss"

28
dolphinscheduler-master/src/main/resources/bootstrap.yaml

@ -0,0 +1,28 @@
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
# The ASF licenses this file to You under the Apache License, Version 2.0
# (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
spring:
application:
name: master-server
cloud:
kubernetes:
reload:
enabled: true
mode: event
config:
sources:
- name: ${spring.application.name}

4
dolphinscheduler-standalone-server/pom.xml

@ -77,10 +77,6 @@
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-kubernetes-fabric8-config</artifactId>

2
dolphinscheduler-standalone-server/src/main/resources/application.yaml

@ -16,8 +16,6 @@
#
spring:
application:
name: standalone-server
jackson:
time-zone: UTC
date-format: "yyyy-MM-dd HH:mm:ss"

28
dolphinscheduler-standalone-server/src/main/resources/bootstrap.yaml

@ -0,0 +1,28 @@
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
# The ASF licenses this file to You under the Apache License, Version 2.0
# (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
spring:
application:
name: standalone-server
cloud:
kubernetes:
reload:
enabled: true
mode: event
config:
sources:
- name: ${spring.application.name}

35
dolphinscheduler-worker/pom.xml

@ -18,18 +18,29 @@
~ under the License.
~
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>dolphinscheduler</artifactId>
<groupId>org.apache.dolphinscheduler</groupId>
<artifactId>dolphinscheduler</artifactId>
<version>dev-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>dolphinscheduler-worker</artifactId>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.apache.dolphinscheduler</groupId>
<artifactId>dolphinscheduler-bom</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
<dependency>
<groupId>org.apache.dolphinscheduler</groupId>
@ -66,8 +77,8 @@
<artifactId>spring-boot-starter-tomcat</artifactId>
</exclusion>
<exclusion>
<artifactId>log4j-to-slf4j</artifactId>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-to-slf4j</artifactId>
</exclusion>
</exclusions>
</dependency>
@ -93,19 +104,13 @@
<groupId>org.apache.dolphinscheduler</groupId>
<artifactId>dolphinscheduler-log-server</artifactId>
</dependency>
</dependencies>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.apache.dolphinscheduler</groupId>
<artifactId>dolphinscheduler-bom</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>import</scope>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-kubernetes-fabric8-config</artifactId>
</dependency>
</dependencies>
</dependencyManagement>
<build>
<plugins>
@ -124,10 +129,10 @@
<executions>
<execution>
<id>dolphinscheduler-worker-server</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<phase>package</phase>
<configuration>
<finalName>worker-server</finalName>
<descriptors>

2
dolphinscheduler-worker/src/main/resources/application.yaml

@ -17,8 +17,6 @@
spring:
banner:
charset: UTF-8
application:
name: worker-server
jackson:
time-zone: UTC
date-format: "yyyy-MM-dd HH:mm:ss"

28
dolphinscheduler-worker/src/main/resources/bootstrap.yaml

@ -0,0 +1,28 @@
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
# The ASF licenses this file to You under the Apache License, Version 2.0
# (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
spring:
application:
name: worker-server
cloud:
kubernetes:
reload:
enabled: true
mode: event
config:
sources:
- name: ${spring.application.name}

11
tools/dependencies/known-dependencies.txt

@ -21,6 +21,8 @@ aws-java-sdk-emr-1.12.160.jar
aws-java-sdk-kms-1.12.160.jar
aws-java-sdk-s3-1.12.160.jar
aws-java-sdk-sagemaker-1.12.160.jar
bcpkix-jdk15on-1.68.jar
bcprov-jdk15on-1.68.jar
bonecp-0.8.0.RELEASE.jar
byte-buddy-1.9.16.jar
caffeine-2.9.3.jar
@ -243,7 +245,13 @@ spring-boot-starter-json-2.7.3.jar
spring-boot-starter-logging-2.7.3.jar
spring-boot-starter-quartz-2.7.3.jar
spring-boot-starter-web-2.7.3.jar
spring-cloud-commons-3.1.3.jar
spring-cloud-context-3.1.3.jar
spring-cloud-kubernetes-commons-2.1.3.jar
spring-cloud-kubernetes-fabric8-autoconfig-2.1.3.jar
spring-cloud-kubernetes-fabric8-config-2.1.3.jar
spring-cloud-starter-3.1.3.jar
spring-cloud-starter-bootstrap-3.1.3.jar
spring-cloud-starter-kubernetes-fabric8-config-2.1.3.jar
spring-context-5.3.19.jar
spring-context-support-5.3.22.jar
@ -254,6 +262,9 @@ spring-jdbc-5.3.19.jar
spring-ldap-1.1.2.jar
spring-plugin-core-2.0.0.RELEASE.jar
spring-plugin-metadata-2.0.0.RELEASE.jar
spring-retry-1.3.3.jar
spring-security-crypto-5.7.3.jar
spring-security-rsa-1.0.10.RELEASE.jar
spring-tx-5.3.19.jar
spring-web-5.3.22.jar
spring-webmvc-5.3.22.jar

Loading…
Cancel
Save