Ver código fonte

fix: 实例无日志显示的bug

370774330@qq.com 5 anos atrás
pai
commit
93907712b7

+ 1 - 2
web/src/main/java/cn/seecoder/web/controller/pipeline/DeploymentController.java

@@ -72,7 +72,6 @@ public class DeploymentController {
     @GetMapping("/log")
     public Response log(@RequestParam("projectId")Integer projectId,
                            @RequestParam("pipelineId")Integer pipelineId) throws ServiceException {
-        deploymentService.log(projectId,pipelineId);
-        return Response.buildSuccess();
+        return Response.buildSuccess(deploymentService.log(projectId,pipelineId));
     }
 }

+ 1 - 1
web/src/main/java/cn/seecoder/web/core/pipeline/inspector/PipelineInspector.java

@@ -86,7 +86,7 @@ public class PipelineInspector {
                 .namespace(namespace)
                 .labels(Collections.singletonMap(K8sConstants.APPLICATION_LABEL,deployName))
                 .build());
-        return logApi.getAll(namespace,pods.get(0).getName());
+        return logApi.getAll(namespace,pods.get(0).getName(),pods.get(0).getContainers().get(0).getName());
     }
 
 

+ 14 - 1
web/src/main/java/cn/seecoder/web/service/impl/pipeline/DeploymentServiceImpl.java

@@ -1,5 +1,6 @@
 package cn.seecoder.web.service.impl.pipeline;
 
+import cn.seecoder.api.k8s.K8sConstants;
 import cn.seecoder.web.dao.pipeline.DeploymentMapper;
 import cn.seecoder.web.dao.pipeline.PipelineRecordMapper;
 import cn.seecoder.web.dao.pipeline.PipelineMapper;
@@ -29,6 +30,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
+import static cn.seecoder.web.core.pipeline.template.PipelineTemplateTable.MYSQL;
+
 /**
  * @author PuHong Weng
  * @date 2021/3/12
@@ -111,7 +114,17 @@ public class DeploymentServiceImpl implements DeploymentService {
         DeploymentPO deployment = deploymentMapper.selectByPipelineId(pipelineId);
         if (deployment == null){
             //第一次部署
-            String accessUrl = pipelinePO.getName()+"."+projectPO.getUniqueK8sNamespace()+ properties.getK8s().getIngressHostSuffix();
+            String accessUrl;
+            //根据模板类型设置起的访问路径
+            switch (pipelinePO.getTemplateName()){
+                case MYSQL:
+                    //集群无法暴露tcp端口,只提供了集群内部访问的url
+                    accessUrl = pipelinePO.getName() + K8sConstants.SERVICE_SUFFIX+"."+projectPO.getUniqueK8sNamespace() +".svc.cluster.local";
+                    break;
+                default:
+                    accessUrl = pipelinePO.getName()+"."+projectPO.getUniqueK8sNamespace()+ properties.getK8s().getIngressHostSuffix();
+                    break;
+            }
             deploymentMapper.insert(DeploymentPO.builder()
                     .namespace(projectPO.getUniqueK8sNamespace())
                     .deployName(pipelinePO.getName())