Browse Source

refactor: 删除流水线context中的templateName

370774330@qq.com 5 years ago
parent
commit
70d4b7fa5a

+ 0 - 2
core/src/main/java/seecoder/devcloud/core/pipeline/Context.java

@@ -24,8 +24,6 @@ public class Context {
 
     private Integer pipelineId;
 
-    private String templateName;
-
     private String namespace;
 
     private String deployName;

+ 11 - 12
core/src/main/java/seecoder/devcloud/core/pipeline/PipelineFactory.java

@@ -19,18 +19,17 @@ import java.util.List;
 public class PipelineFactory {
     /**
      * 流水线初始化
-     * @param configJson configJson 流水线配置的json字符串
-     * @param namespace 流水线的k8s namespace,devcloud后端采用{@code Project}中的{@code name}作为namespace
-     * @param deployName 流水线部署k8s的应用名称,devcloud后端采用{@code Pipeline}中的{@code name} 作为project name
-     * @param templateName 模板名称
+     *
+     * @param configJson   configJson 流水线配置的json字符串
+     * @param namespace    流水线的k8s namespace,devcloud后端采用{@code Project}中的{@code name}作为namespace
+     * @param deployName   流水线部署k8s的应用名称,devcloud后端采用{@code Pipeline}中的{@code name} 作为project name
      * @return
      */
-    public static Pipeline init(String configJson, String namespace, String deployName,  String templateName) throws PipelineException {
+    public static Pipeline init(String configJson, String namespace, String deployName) throws PipelineException {
         //初始化context
         Context context = Context.builder()
                 .deployName(deployName)
                 .namespace(namespace)
-                .templateName(templateName)
                 .build();
         Handler firstHandler = initHandlerChainAndContext(configJson);
         return new PipelineImpl(firstHandler, context);
@@ -44,7 +43,6 @@ public class PipelineFactory {
         AbstractHandler head = new AbstractHandler() {
             @Override
             public void process(Context context) throws PipelineException {
-
             }
         };
         Handler cur = head;
@@ -52,15 +50,16 @@ public class PipelineFactory {
         ObjectMapper mapper = new ObjectMapper();
         List<ObjectNode> handlers;
         try {
-            handlers = mapper.readValue(configJson, new TypeReference<List<ObjectNode>>() {});
-            for (ObjectNode node : handlers){
-                String name = node.get("name").toString().replaceAll("\"","");
+            handlers = mapper.readValue(configJson, new TypeReference<List<ObjectNode>>() {
+            });
+            for (ObjectNode node : handlers) {
+                String name = node.get("name").toString().replaceAll("\"", "");
                 JsonNode configs = node.get("configs");
-                cur.setNextHandler(HandlerConfigTable.transToHandler(name,configs));
+                cur.setNextHandler(HandlerConfigTable.transToHandler(name, configs));
                 cur = cur.getNextHandler();
             }
         } catch (Exception e) {
-            throw new PipelineException(HttpStatus.SC_BAD_REQUEST,PipelineException.CONFIG_TRANSFER_ERROR,e);
+            throw new PipelineException(HttpStatus.SC_BAD_REQUEST, PipelineException.CONFIG_TRANSFER_ERROR, e);
         }
         return head.getNextHandler();
     }

+ 1 - 1
core/src/main/java/seecoder/devcloud/core/pipeline/handler/JavaImageBuildHandler.java

@@ -52,7 +52,7 @@ public class JavaImageBuildHandler extends AbstractHandler {
     @Override
     public void process(Context context) throws PipelineException {
         //0. 变量准备
-        String templateName = context.getTemplateName();
+        String templateName = PipelineTemplateTable.SPRINGBOOT_JAVA8;
         String imageName = context.getNamespace() + "-" + context.getDeployName();
 
         // 1. 有git从git拿到地址仓库

+ 3 - 3
core/src/main/java/seecoder/devcloud/core/pipeline/handler/K8sDeploymentHandler.java

@@ -109,10 +109,10 @@ public class K8sDeploymentHandler extends AbstractHandler {
                     .build());
             if (deployments.size() == 0) {
                 deploymentApi.create(deployment);
-                log.info("deployment创建成功: [namespace: " + context.getNamespace() + ", deployName: " + context.getTemplateName() + "]");
+                log.info("deployment创建成功: [namespace: " + context.getNamespace() + ", deployName: " + context.getDeployName() + "]");
             } else {
                 deploymentApi.update(deployment);
-                log.info("deployment更新成功: [namespace: " + context.getNamespace() + ", deployName: " + context.getTemplateName() + "]");
+                log.info("deployment更新成功: [namespace: " + context.getNamespace() + ", deployName: " + context.getDeployName() + "]");
 
             }
         } catch (K8sApiException e) {
@@ -122,7 +122,7 @@ public class K8sDeploymentHandler extends AbstractHandler {
 
         //5. 存入暴露的端口
         context.getConfigs().put("port", String.valueOf(port));
-        context.appendSuccessResult("K8s Deployment部署成功: [namespace: " + context.getNamespace() + ", deployName: " + context.getTemplateName() + "]");
+        context.appendSuccessResult("K8s Deployment部署成功: [namespace: " + context.getNamespace() + ", deployName: " + context.getDeployName() + "]");
     }
 
 }

+ 3 - 3
core/src/main/java/seecoder/devcloud/core/pipeline/handler/K8sNamespaceHandler.java

@@ -41,14 +41,14 @@ public class K8sNamespaceHandler extends AbstractHandler {
                     .name(context.getNamespace()).build());
             if (namespaces.size() == 0) {
                 namespace = namespaceApi.create(namespace);
-                log.info("Namespace创建成功: [namespace: " + context.getNamespace() + ", deployName: " + context.getTemplateName() + "]");
+                log.info("Namespace创建成功: [namespace: " + context.getNamespace() + ", deployName: " + context.getDeployName() + "]");
             } else {
-                log.info("Namespace已经存在, 无需新建: [namespace: " + context.getNamespace() + ", deployName: " + context.getTemplateName() + "]");
+                log.info("Namespace已经存在, 无需新建: [namespace: " + context.getNamespace() + ", deployName: " + context.getDeployName() + "]");
             }
         } catch (K8sApiException e) {
             context.appendErrorResult(PipelineException.NAMESPACE_CREATE_ERROR, e);
             throw new PipelineException(HttpStatus.SC_SERVICE_UNAVAILABLE, PipelineException.NAMESPACE_CREATE_ERROR, e);
         }
-        context.appendSuccessResult("K8s Namespace创建成功: [namespace: " + context.getNamespace() + ", deployName: " + context.getTemplateName() + "]");
+        context.appendSuccessResult("K8s Namespace创建成功: [namespace: " + context.getNamespace() + ", deployName: " + context.getDeployName() + "]");
     }
 }

+ 3 - 3
core/src/main/java/seecoder/devcloud/core/pipeline/handler/K8sServiceHandler.java

@@ -58,10 +58,10 @@ public class K8sServiceHandler extends AbstractHandler {
                     .build());
             if (services.size() == 0) {
                 serviceApi.create(service);
-                log.info("service创建成功: [namespace: " + context.getNamespace() + ", deployName: " + context.getTemplateName() + "]");
+                log.info("service创建成功: [namespace: " + context.getNamespace() + ", deployName: " + context.getDeployName() + "]");
             } else {
                 serviceApi.update(service);
-                log.info("service更新成功: [namespace: " + context.getNamespace() + ", deployName: " + context.getTemplateName() + "]");
+                log.info("service更新成功: [namespace: " + context.getNamespace() + ", deployName: " + context.getDeployName() + "]");
             }
         } catch (K8sApiException e) {
             context.appendErrorResult(PipelineException.SERVICE_CREATE_ERROR, e);
@@ -70,6 +70,6 @@ public class K8sServiceHandler extends AbstractHandler {
 
         //3. 存放暴露的端口
         context.getConfigs().put("servicePort", String.valueOf(servicePort));
-        context.appendSuccessResult("K8s Service创建成功: [namespace: " + context.getNamespace() + ", deployName: " + context.getTemplateName() + "]");
+        context.appendSuccessResult("K8s Service创建成功: [namespace: " + context.getNamespace() + ", deployName: " + context.getDeployName() + "]");
     }
 }

+ 1 - 1
core/src/main/java/seecoder/devcloud/core/pipeline/handler/NodeImageBuildHandler.java

@@ -50,7 +50,7 @@ public class NodeImageBuildHandler extends AbstractHandler{
     @Override
     public void process(Context context) throws PipelineException {
         //0. 变量准备
-        String templateName = context.getTemplateName();
+        String templateName = PipelineTemplateTable.NODE_10;
         String imageName = context.getNamespace() + "-" + context.getDeployName();
 
         // 1. 有git从git拿到地址仓库