优化

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

@@ -277,24 +277,26 @@ public class K8sController {
         }
         // 再创建新pod
         Deployment deployment = null;
+        // 删除原来的Service
+        if (k8sService.queryIfServiceExistByName(namespace, serviceName)) {
+            k8sService.deleteService(namespace, serviceName);
+        }
+        // 类型为Java
         if (label.equals("java")) {
             deployment = k8sService.createJavaDeployment(serviceCreateVo, dockerProject);
-            if (!k8sService.queryIfServiceExistByName(namespace, serviceName)) {
-                k8sService.createJavaService(namespace, serviceName, serviceCreateVo.getDebug());
-            }
-            if (!k8sService.queryIfIngressExistByName(namespace, serviceName)) {
-                k8sService.createIngress(namespace, serviceName, serviceCreateVo.getDomain());
-            }
+            k8sService.createJavaService(namespace, serviceName, serviceCreateVo.getDebug());
         }
+        // 类型为UI
         if (label.equals("ui") || label.equals("node")) {
             deployment = k8sService.createUIAndNodeDeployment(serviceCreateVo, dockerProject);
-            if (!k8sService.queryIfServiceExistByName(namespace, serviceName)) {
-                k8sService.createUIAndNodeService(namespace, serviceName, type, label);
-            }
-            if (!k8sService.queryIfIngressExistByName(namespace, serviceName)) {
-                k8sService.createIngress(namespace, serviceName, serviceCreateVo.getDomain());
-            }
+            k8sService.createUIAndNodeService(namespace, serviceName, type, label);
+        }
+        // 删除原有Ingress
+        if (k8sService.queryIfIngressExistByName(namespace, serviceName)) {
+            k8sService.deleteIngress(namespace, serviceName);
         }
+        // 创建新的Ingress
+        k8sService.createIngress(namespace, serviceName, serviceCreateVo.getDomain());
         if (deployment != null) {
             return JsonResult.buildSuccessResult("更新成功！", true);
         } else {

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

@@ -457,14 +457,14 @@ public class K8sService {
      * @return
      */
     public boolean deleteDeployment(String namespace, String serviceName) {
-        // 删除service
+        // 删除Service
+        log.info("删除{}环境{}的Service.", namespace, serviceName);
         kubernetesClient.services().inNamespace(namespace).withName(serviceName).delete();
-        Map<String, String> map = new HashMap<>();
-        map.put("qcloud-app", serviceName);
-        LabelSelector labelSelector = new LabelSelector();
-        labelSelector.setMatchLabels(map);
-        // 删除deployment
-        log.info("删除{}环境的pod：{}", namespace, serviceName);
+        // 删除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();
     }