| @@ -88,8 +88,6 @@ public class ImageServiceImpl implements ImageService { | |||||
| private String image; | private String image; | ||||
| @Value("${dockerpush.mountPath}") | @Value("${dockerpush.mountPath}") | ||||
| private String mountPath; | private String mountPath; | ||||
| @Value("${dockerpush.proxyUrl}") | |||||
| private String proxyUrl; | |||||
| @Value("${jupyter.namespace}") | @Value("${jupyter.namespace}") | ||||
| private String namespace; | private String namespace; | ||||
| @@ -324,7 +322,7 @@ public class ImageServiceImpl implements ImageService { | |||||
| V1Pod pod = k8sClientUtil.getNSPodList(serviceNS, deploymentName); | V1Pod pod = k8sClientUtil.getNSPodList(serviceNS, deploymentName); | ||||
| if (pod == null) { | if (pod == null) { | ||||
| String podName = deploymentName + "-" + DateUtils.formatYMD10(new Date()); | String podName = deploymentName + "-" + DateUtils.formatYMD10(new Date()); | ||||
| pod = k8sClientUtil.createPodWithEnv(podName, serviceNS, proxyUrl, mountPath, image); | |||||
| pod = k8sClientUtil.createPodWithEnv(podName, serviceNS, mountPath, image); | |||||
| } | } | ||||
| String loginCmd = "docker login -u " + harborUser + " -p " + harborpassword + " " + harborUrl; | String loginCmd = "docker login -u " + harborUser + " -p " + harborpassword + " " + harborUrl; | ||||
| // 执行命令 docker login -u admin -p Harbor12345 172.20.32.187 | // 执行命令 docker login -u admin -p Harbor12345 172.20.32.187 | ||||
| @@ -367,7 +365,7 @@ public class ImageServiceImpl implements ImageService { | |||||
| V1Pod pod = k8sClientUtil.getNSPodList(serviceNS, deploymentName); | V1Pod pod = k8sClientUtil.getNSPodList(serviceNS, deploymentName); | ||||
| if (pod == null) { | if (pod == null) { | ||||
| String podName = deploymentName + "-" + DateUtils.formatYMD10(new Date()); | String podName = deploymentName + "-" + DateUtils.formatYMD10(new Date()); | ||||
| pod = k8sClientUtil.createPodWithEnv(podName, serviceNS, proxyUrl, mountPath, image); | |||||
| pod = k8sClientUtil.createPodWithEnv(podName, serviceNS, mountPath, image); | |||||
| } | } | ||||
| String loginCmd = "docker login -u " + harborUser + " -p " + harborpassword + " " + harborUrl; | String loginCmd = "docker login -u " + harborUser + " -p " + harborpassword + " " + harborUrl; | ||||
| // 执行命令 docker login -u admin -p Harbor12345 172.20.32.187 | // 执行命令 docker login -u admin -p Harbor12345 172.20.32.187 | ||||