|
@@ -40,8 +40,6 @@ public class ProjectUtil {
|
|
|
String username;
|
|
|
@Value("${scheduler.host.password}")
|
|
|
String password;
|
|
|
- @Value("${scheduler.kubernetes.namespace}")
|
|
|
- String kubernetesNamespace;
|
|
|
|
|
|
|
|
|
@Resource
|
|
@@ -82,7 +80,7 @@ public class ProjectUtil {
|
|
|
// 先删除 redis key
|
|
|
RedisUtil.deleteByKey(stringRedisTemplate, "pod:" + podName + ":node");
|
|
|
try {
|
|
|
- KubernetesUtil.deletePod(apiClient, kubernetesNamespace, podName);
|
|
|
+ KubernetesUtil.deletePod(apiClient, kubernetesConfiguration.getNamespace(), podName);
|
|
|
} catch (Exception e) {
|
|
|
log.info("ProjectUtil--deletePod pod " + podName + " 不存在。");
|
|
|
}
|
|
@@ -106,7 +104,7 @@ public class ProjectUtil {
|
|
|
String podYamlName = podName + ".yaml"; // 模板文件名称
|
|
|
String podYamlPath = podYamlDirectory + podYamlName;
|
|
|
FileUtil.writeStringToLocalFile(podYamlContent, podYamlPath);
|
|
|
- KubernetesUtil.createNs(apiClient, kubernetesNamespace);
|
|
|
+ KubernetesUtil.createNs(apiClient, kubernetesConfiguration.getNamespace());
|
|
|
KubernetesUtil.applyYaml(hostname, username, password, podYamlPath);
|
|
|
// 下面这种执行方法报错
|
|
|
// V1Pod v1Pod = (V1Pod) Yaml.load(nextPodString);
|