Unverified Commit 9fb011ae authored by aiwenmo's avatar aiwenmo Committed by GitHub

Fix flinkLibPath in K8S configuration is null and fix cluster-id in test k8s-cluster-config is null

Fix flinkLibPath in K8S configuration is null  && fix cluster-id in test k8s-cluster-config is null
parents 1b3a4d5b c83531dd
......@@ -16,6 +16,7 @@ import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Map;
import java.util.UUID;
/**
* ClusterConfigServiceImpl
......@@ -68,6 +69,9 @@ public class ClusterConfigurationServiceImpl extends SuperServiceImpl<ClusterCon
}
if (kubernetesConfig.containsKey("kubernetes.cluster-id")) {
gatewayConfig.getFlinkConfig().getConfiguration().put("kubernetes.cluster-id", kubernetesConfig.get("kubernetes.cluster-id").toString());
}else{
//初始化FlinkKubeClient需要CLUSTER_ID,先用UUID代替,后面使用job名称来作为CLUSTER_ID
gatewayConfig.getFlinkConfig().getConfiguration().put("kubernetes.cluster-id", UUID.randomUUID().toString());
}
if (kubernetesConfig.containsKey("kubernetes.container.image")) {
gatewayConfig.getFlinkConfig().getConfiguration().put("kubernetes.container.image", kubernetesConfig.get("kubernetes.container.image").toString());
......
......@@ -168,9 +168,7 @@ public class JobConfig {
config.get("flinkLibPath").toString(),
config.get("hadoopConfigPath").toString()));
} else {
gatewayConfig.setClusterConfig(ClusterConfig.build(config.get("flinkConfigPath").toString(),
config.get("flinkLibPath").toString(),
""));
gatewayConfig.setClusterConfig(ClusterConfig.build(config.get("flinkConfigPath").toString()));
}
AppConfig appConfig = new AppConfig();
if (config.containsKey("userJarPath") && Asserts.isNotNullString((String) config.get("userJarPath"))) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment