|
@@ -158,16 +158,15 @@ public class ProjectUtil {
|
|
|
final String replace = read.replace("cpu-order", "\"" + cpuOrderString + "\"");
|
|
|
FileUtil.writeStringToLocalFile(replace, absolutePath);
|
|
|
|
|
|
- createPod3(yamlPathCacheKey);
|
|
|
+ createPod3(yamlPathCacheKey, cpuOrderString);
|
|
|
log.info("createNextPod3() 创建项目 " + projectId + " 在节点 " + nodeName + " 的下一个 pod,使用 cpu 编号为 " + cpuOrderString);
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-
|
|
|
|
|
|
* @param redisKey yaml 地址的缓存 key
|
|
|
*/
|
|
|
- public void createPod3(String redisKey) {
|
|
|
+ public void createPodBegin(String redisKey) {
|
|
|
final String podYamlPath = stringRedisTemplate.opsForValue().get(redisKey);
|
|
|
if (podYamlPath == null) {
|
|
|
throw new RuntimeException("createPod3() 根据缓存 key 获取 yaml 地址为 null:" + redisKey);
|
|
@@ -180,18 +179,23 @@ public class ProjectUtil {
|
|
|
}
|
|
|
|
|
|
|
|
|
- public String getProjectTypeByProjectId(String projectId) {
|
|
|
- String projectType = null;
|
|
|
- ProjectPO manualProjectPO = manualProjectMapper.selectById(projectId);
|
|
|
- ProjectPO autoSubProjectPO = autoSubProjectMapper.selectById(projectId);
|
|
|
- if (manualProjectPO != null) {
|
|
|
- projectType = DictConstants.PROJECT_TYPE_MANUAL;
|
|
|
- } else if (autoSubProjectPO != null) {
|
|
|
- projectType = DictConstants.PROJECT_TYPE_AUTO_SUB;
|
|
|
+
|
|
|
+ * @param redisKey yaml 地址的缓存 key
|
|
|
+ */
|
|
|
+ public void createPod3(String redisKey, String cpuOrderString) {
|
|
|
+ final String podYamlPath = stringRedisTemplate.opsForValue().get(redisKey);
|
|
|
+ if (podYamlPath == null) {
|
|
|
+ throw new RuntimeException("createPod3() 根据缓存 key 获取 yaml 地址为 null:" + redisKey);
|
|
|
}
|
|
|
- return projectType;
|
|
|
+ stringRedisTemplate.delete(redisKey);
|
|
|
+ String nodeName = new File(podYamlPath).getName().split("#")[0];
|
|
|
+ String podName = podYamlPath.split("#")[1].split("\\.")[0];
|
|
|
+ stringRedisTemplate.opsForValue().set("pod:" + podName + ":node", nodeName);
|
|
|
+ stringRedisTemplate.opsForValue().set("pod:" + podName + ":cpu", cpuOrderString);
|
|
|
+ new Thread(() -> KubernetesUtil.applyYaml(hostname, username, password, podYamlPath), "create-" + podName).start();
|
|
|
}
|
|
|
|
|
|
+
|
|
|
public ProjectPO getProjectByProjectId(String projectId) {
|
|
|
ProjectPO manualProjectPO = manualProjectMapper.selectById(projectId);
|
|
|
ProjectPO autoSubProjectPO = autoSubProjectMapper.selectById(projectId);
|