BUG修复

src/main/java/cn/qg/holmes/controller/k8s/K8sController.java

@@ -223,18 +223,18 @@ public class K8sController {
         if (label.equals("java")) {
             // JAVA
             DockerProject dockerProject = dockerProjectService.getOne(queryWrapper);
-            // 创建Service
-            if (k8sService.queryIfServiceExistByName(namespace, serviceName)) {
-                k8sService.deleteService(namespace, serviceName);
-            }
-            k8sService.createJavaService(namespace, serviceName, serviceCreateVo.getDebug());
-
             // 创建Deployment
             if (k8sService.queryIfDeploymentExistByName(namespace, serviceName)) {
                 k8sService.deleteDeployment(namespace, serviceName);
             }
             k8sService.createJavaDeployment(serviceCreateVo, dockerProject);
 
+            // 创建Service
+            if (k8sService.queryIfServiceExistByName(namespace, serviceName)) {
+                k8sService.deleteService(namespace, serviceName);
+            }
+            k8sService.createJavaService(namespace, serviceName, serviceCreateVo.getDebug());
+
             // 创建Ingress
             if (k8sService.queryIfIngressExistByName(namespace, serviceName)) {
                 k8sService.deleteIngress(namespace, serviceName);
@@ -243,18 +243,18 @@ public class K8sController {
         } else if (label.equals("ui") || label.equals("node")) {
             // UI
             DockerProject dockerProject = dockerProjectService.getOne(queryWrapper);
-            // 创建Service
-            if (k8sService.queryIfServiceExistByName(namespace, serviceName)) {
-                k8sService.deleteService(namespace, serviceName);
-            }
-            k8sService.createUIAndNodeService(namespace, serviceName, type, label);
-
             // 创建Deployment
             if (k8sService.queryIfDeploymentExistByName(namespace, serviceName)) {
                 k8sService.deleteDeployment(namespace, serviceName);
             }
             k8sService.createUIAndNodeDeployment(serviceCreateVo, dockerProject);
 
+            // 创建Service
+            if (k8sService.queryIfServiceExistByName(namespace, serviceName)) {
+                k8sService.deleteService(namespace, serviceName);
+            }
+            k8sService.createUIAndNodeService(namespace, serviceName, type, label);
+
             // 创建Ingress
             if (k8sService.queryIfIngressExistByName(namespace, serviceName)) {
                 k8sService.deleteIngress(namespace, serviceName);
@@ -298,7 +298,7 @@ public class K8sController {
             deployment = k8sService.createJavaDeployment(serviceCreateVo, dockerProject);
             k8sService.createJavaService(namespace, serviceName, serviceCreateVo.getDebug());
         }
-        // 类型为UI
+        // 类型为UI或Node
         if (label.equals("ui") || label.equals("node")) {
             deployment = k8sService.createUIAndNodeDeployment(serviceCreateVo, dockerProject);
             k8sService.createUIAndNodeService(namespace, serviceName, type, label);

src/main/java/cn/qg/holmes/service/k8s/K8sService.java

@@ -458,11 +458,11 @@ public class K8sService {
      */
     public boolean deleteDeployment(String namespace, String serviceName) {
         // 删除Service
-        log.info("删除{}环境{}的Service.", namespace, serviceName);
-        kubernetesClient.services().inNamespace(namespace).withName(serviceName).delete();
-        // 删除Ingress
-        log.info("删除{}环境{}的Ingress.", namespace, serviceName);
-        kubernetesClient.extensions().ingresses().inNamespace(namespace).withName(serviceName).delete();
+//        log.info("删除{}环境{}的Service.", namespace, serviceName);
+//        kubernetesClient.services().inNamespace(namespace).withName(serviceName).delete();
+//        // 删除Ingress
+//        log.info("删除{}环境{}的Ingress.", namespace, serviceName);
+//        kubernetesClient.extensions().ingresses().inNamespace(namespace).withName(serviceName).delete();
         // 删除eployment
         log.info("删除{}环境{}的pod.", namespace, serviceName);
         return kubernetesClient.apps().deployments().inNamespace(namespace).withName(serviceName).delete();
@@ -2205,6 +2205,7 @@ public class K8sService {
      * @return
      */
     public boolean deleteIngress(String namespace, String serviceName) {
+        log.info("删除{}环境的{} Ingress", namespace, serviceName);
         return kubernetesClient.extensions().ingresses().inNamespace(namespace).withName(serviceName).delete();
     }
 
@@ -2215,6 +2216,7 @@ public class K8sService {
      * @return
      */
     public boolean deleteService(String namespace, String serviceName) {
+        log.info("删除{}环境的{} Service", namespace, serviceName);
         return kubernetesClient.services().inNamespace(namespace).withName(serviceName).delete();
     }
 
@@ -2227,10 +2229,10 @@ public class K8sService {
     }
 
     public static void main(String[] args) {
-        K8sService k8sService = new K8sService();
+//        K8sService k8sService = new K8sService();
 //        k8sService.createNewNamespace("test6", "dev", "黎博");
 //        k8sService.podTest();
 //        k8sService.getPodList("k8s");
-        System.out.println(JSON.toJSONString(k8sService.getPodListNew("fe")));
+//        System.out.println(JSON.toJSONString(k8sService.getPodListNew("fe")));
     }
 }