|
|
|
@@ -97,9 +97,8 @@ public class JupyterServiceImpl implements JupyterService { |
|
|
|
// String modelPath = "argo-workflow" + "/" + model.get("path"); |
|
|
|
String modelPath = (String) model.get("path"); |
|
|
|
|
|
|
|
LoginUser loginUser = SecurityUtils.getLoginUser(); |
|
|
|
//构造pod名称 |
|
|
|
String podName = loginUser.getUsername().toLowerCase() + "-editor-pod" + "-" + id; |
|
|
|
String podName = devEnvironment.getCreateBy() + "-editor-pod" + "-" + id; |
|
|
|
//新建编辑器的pvc |
|
|
|
// String pvcName = loginUser.getUsername().toLowerCase() + "-editor-pvc"; |
|
|
|
// V1PersistentVolumeClaim pvc = k8sClientUtil.createPvc(namespace, pvcName, storage, storageClassName); |
|
|
|
@@ -123,10 +122,9 @@ public class JupyterServiceImpl implements JupyterService { |
|
|
|
if (devEnvironment == null) { |
|
|
|
throw new Exception("开发环境配置不存在"); |
|
|
|
} |
|
|
|
LoginUser loginUser = SecurityUtils.getLoginUser(); |
|
|
|
//构造pod和svc名称 |
|
|
|
String podName = loginUser.getUsername().toLowerCase() + "-editor-pod" + "-" + id; |
|
|
|
String svcName = loginUser.getUsername().toLowerCase() + "-editor-pod" + "-" + id + "-svc"; |
|
|
|
String podName = devEnvironment.getCreateBy() + "-editor-pod" + "-" + id; |
|
|
|
String svcName = devEnvironment.getCreateBy() + "-editor-pod" + "-" + id + "-svc"; |
|
|
|
//得到pod |
|
|
|
V1Pod pod = k8sClientUtil.getNSPodList(namespace, podName); |
|
|
|
if (pod == null) { |
|
|
|
|