diff --git a/README.md b/README.md
index 121e70faec..232e5c3152 100644
--- a/README.md
+++ b/README.md
@@ -99,7 +99,7 @@ Dinky(原 Dlink):
抢先体验( main 主支):dlink-0.6.0-SNAPSHOT
-稳定版本( 0.5.0 分支):dlink-0.5.0
+稳定版本( 0.5.1 分支):dlink-0.5.1
### 从安装包开始
diff --git a/dlink-admin/pom.xml b/dlink-admin/pom.xml
index 327d3dc79d..c78624e92d 100644
--- a/dlink-admin/pom.xml
+++ b/dlink-admin/pom.xml
@@ -5,7 +5,7 @@
dlink
com.dlink
- 0.5.0
+ 0.5.1
4.0.0
@@ -66,7 +66,7 @@
-
-
- org.apache.logging.log4j
- log4j-api
-
-
- org.apache.logging.log4j
- log4j-core
-
-
- org.slf4j
- slf4j-log4j12
mysql
@@ -136,7 +124,7 @@
\ No newline at end of file
diff --git a/dlink-client/dlink-client-hadoop/pom.xml b/dlink-client/dlink-client-hadoop/pom.xml
index 792f125d8b..72897383ad 100644
--- a/dlink-client/dlink-client-hadoop/pom.xml
+++ b/dlink-client/dlink-client-hadoop/pom.xml
@@ -5,7 +5,7 @@
dlink-client
com.dlink
- 0.5.0
+ 0.5.1
4.0.0
@@ -13,7 +13,7 @@
UTF-8
- 2.7.7
+ 3.1.0
compile
diff --git a/dlink-client/pom.xml b/dlink-client/pom.xml
index 9a499e964c..371b42192d 100644
--- a/dlink-client/pom.xml
+++ b/dlink-client/pom.xml
@@ -5,7 +5,7 @@
dlink
com.dlink
- 0.5.0
+ 0.5.1
4.0.0
diff --git a/dlink-common/pom.xml b/dlink-common/pom.xml
index 22cc37c475..6f958a3ddd 100644
--- a/dlink-common/pom.xml
+++ b/dlink-common/pom.xml
@@ -5,7 +5,7 @@
dlink
com.dlink
- 0.5.0
+ 0.5.1
4.0.0
diff --git a/dlink-common/src/main/java/com/dlink/constant/CommonConstant.java b/dlink-common/src/main/java/com/dlink/constant/CommonConstant.java
index 8482081208..115e9e124e 100644
--- a/dlink-common/src/main/java/com/dlink/constant/CommonConstant.java
+++ b/dlink-common/src/main/java/com/dlink/constant/CommonConstant.java
@@ -10,7 +10,7 @@ public interface CommonConstant {
/**
* 项目版本号(banner使用)
*/
- String PROJECT_VERSION = "0.5.0";
+ String PROJECT_VERSION = "0.5.1";
/**
* 实例健康
*/
diff --git a/dlink-connectors/dlink-connector-jdbc-1.12/pom.xml b/dlink-connectors/dlink-connector-jdbc-1.12/pom.xml
index da3afb2b48..a015ced853 100644
--- a/dlink-connectors/dlink-connector-jdbc-1.12/pom.xml
+++ b/dlink-connectors/dlink-connector-jdbc-1.12/pom.xml
@@ -5,7 +5,7 @@
dlink-connectors
com.dlink
- 0.5.0
+ 0.5.1
4.0.0
diff --git a/dlink-connectors/dlink-connector-jdbc-1.13/pom.xml b/dlink-connectors/dlink-connector-jdbc-1.13/pom.xml
index 23af2b61b6..a738c96cc8 100644
--- a/dlink-connectors/dlink-connector-jdbc-1.13/pom.xml
+++ b/dlink-connectors/dlink-connector-jdbc-1.13/pom.xml
@@ -5,7 +5,7 @@
dlink-connectors
com.dlink
- 0.5.0
+ 0.5.1
4.0.0
diff --git a/dlink-connectors/pom.xml b/dlink-connectors/pom.xml
index 2eb74ead16..dd416c67ce 100644
--- a/dlink-connectors/pom.xml
+++ b/dlink-connectors/pom.xml
@@ -5,7 +5,7 @@
dlink
com.dlink
- 0.5.0
+ 0.5.1
4.0.0
pom
diff --git a/dlink-core/pom.xml b/dlink-core/pom.xml
index 546bb23011..78150e3181 100644
--- a/dlink-core/pom.xml
+++ b/dlink-core/pom.xml
@@ -5,7 +5,7 @@
dlink
com.dlink
- 0.5.0
+ 0.5.1
4.0.0
jar
@@ -16,6 +16,8 @@
UTF-8
1.8
1.8
+
+ provided
@@ -70,5 +72,10 @@
dlink-gateway
${scope.runtime}
+
+ com.dlink
+ dlink-client-hadoop
+ ${scope.runtime}
+
\ No newline at end of file
diff --git a/dlink-core/src/main/java/com/dlink/job/JobConfig.java b/dlink-core/src/main/java/com/dlink/job/JobConfig.java
index 7bd03fa710..5edf1e64ca 100644
--- a/dlink-core/src/main/java/com/dlink/job/JobConfig.java
+++ b/dlink-core/src/main/java/com/dlink/job/JobConfig.java
@@ -159,9 +159,15 @@ public void setSessionConfig(SessionConfig sessionConfig){
public void buildGatewayConfig(Map config){
gatewayConfig = new GatewayConfig();
- gatewayConfig.setClusterConfig(ClusterConfig.build(config.get("flinkConfigPath").toString(),
- config.get("flinkLibPath").toString(),
- config.get("hadoopConfigPath").toString()));
+ if(config.containsKey("hadoopConfigPath")) {
+ gatewayConfig.setClusterConfig(ClusterConfig.build(config.get("flinkConfigPath").toString(),
+ config.get("flinkLibPath").toString(),
+ config.get("hadoopConfigPath").toString()));
+ }else {
+ gatewayConfig.setClusterConfig(ClusterConfig.build(config.get("flinkConfigPath").toString(),
+ config.get("flinkLibPath").toString(),
+ ""));
+ }
AppConfig appConfig = new AppConfig();
if(config.containsKey("userJarPath") && Asserts.isNotNullString((String) config.get("userJarPath"))){
appConfig.setUserJarPath(config.get("userJarPath").toString());
@@ -176,6 +182,18 @@ public void buildGatewayConfig(Map config){
if(config.containsKey("flinkConfig") && Asserts.isNotNullMap((Map) config.get("flinkConfig"))){
gatewayConfig.setFlinkConfig(FlinkConfig.build((Map)config.get("flinkConfig")));
}
+ if(config.containsKey("kubernetesConfig")){
+ Map kubernetesConfig = (Map) config.get("kubernetesConfig");
+ if(kubernetesConfig.containsKey("kubernetes.namespace")) {
+ gatewayConfig.getFlinkConfig().getConfiguration().put("kubernetes.namespace", kubernetesConfig.get("kubernetes.namespace").toString());
+ }
+ if(kubernetesConfig.containsKey("kubernetes.cluster-id")) {
+ gatewayConfig.getFlinkConfig().getConfiguration().put("kubernetes.cluster-id", kubernetesConfig.get("kubernetes.cluster-id").toString());
+ }
+ if(kubernetesConfig.containsKey("kubernetes.container.image")) {
+ gatewayConfig.getFlinkConfig().getConfiguration().put("kubernetes.container.image", kubernetesConfig.get("kubernetes.container.image").toString());
+ }
+ }
}
public void addGatewayConfig(List