优化日志

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

@@ -508,11 +508,12 @@ public class TkeService {
      * @return
      */
     public boolean deleteDeployment(String namespace, String serviceName) {
-        log.info("删除{}环境{}的deployment.", namespace, serviceName);
+        log.info("开始删除{}环境{}的Deployment.", namespace, serviceName);
         return kubernetesClient.apps().deployments().inNamespace(namespace).withName(serviceName).delete();
     }
 
     public boolean deleteService(String namespace, String serviceName) {
+        log.info("开始删除{}环境{}的Service.", namespace, serviceName);
         // kafka Service需要特殊处理一下
         if (StringUtils.equals("kafka", serviceName)) {
             return kubernetesClient.services().inNamespace(namespace).withName("kafka-" + namespace).delete();
@@ -521,6 +522,7 @@ public class TkeService {
     }
 
     public boolean deleteIngress(String namespace, String serviceName) {
+        log.info("开始删除{}环境{}的Ingress.", namespace, serviceName);
          return kubernetesClient.extensions().ingresses().inNamespace(namespace).withName(serviceName).delete();
     }
 
@@ -604,7 +606,7 @@ public class TkeService {
                 deployment.getSpec().getTemplate().getSpec().getContainers().forEach(container -> container.setReadinessProbe(readinessProbe));
                 deployment.getSpec().getTemplate().getSpec().getContainers().forEach(container -> container.setLivenessProbe(livelinessProbe));
             }
-            log.info("开始创建k8s Deployment: \n{}", YamlUtils.JsonToYamlStr(JSON.toJSONString(deployment)));
+            log.info("开始在{}环境，创建{}的k8s Deployment: \n{}", namespace, serviceName, YamlUtils.JsonToYamlStr(JSON.toJSONString(deployment)));
             return kubernetesClient.apps().deployments().inNamespace(namespace).createOrReplace(deployment);
         } catch (IOException e) {
             log.info("创建Deployment失败！");
@@ -645,7 +647,7 @@ public class TkeService {
             }
             Yaml yaml = new Yaml(new Constructor(Service.class));
             Service service = yaml.load(serviceYaml);
-            log.info("开始创建k8s Service: \n{}", serviceYaml);
+            log.info("开始在{}环境，创建{}服务的，k8s Service: \n{}", namespace, serviceName, serviceYaml);
             return kubernetesClient.services().inNamespace(namespace).createOrReplace(service);
         } catch (IOException e) {
             log.info("Service创建失败.");
@@ -670,7 +672,7 @@ public class TkeService {
             String pvcFilePath = "tke/template/" + StringUtils.capitalize(serviceName) + "-Pvc.yml";
             String pvcYaml = FileUtils.readFileFromClassPathResource(pvcFilePath);
             pvcYaml = TkeUtils.replaceBasicYaml(pvcYaml, serviceCreateVo);
-            log.info("开始创建k8s Pvc：\n{}", pvcYaml);
+            log.info("开始在{}环境，创建{}服务的k8s Pvc：\n{}", namespace, serviceName, pvcYaml);
             Yaml yaml = new Yaml(new Constructor(PersistentVolumeClaim.class));
             PersistentVolumeClaim persistentVolumeClaim = yaml.load(pvcYaml);
             return kubernetesClient.persistentVolumeClaims().inNamespace(namespace).create(persistentVolumeClaim);
@@ -690,7 +692,7 @@ public class TkeService {
         try {
             String ingressYaml = FileUtils.readFileFromClassPathResource("tke/template/Ingress.yml");
             ingressYaml = TkeUtils.replaceBusinessYaml(ingressYaml, serviceCreateVo, null);
-            log.info("开始创建Ingress:\n{}", ingressYaml);
+            log.info("开始在{}环境，创建{}服务的Ingress:\n{}", serviceCreateVo.getNamespace(), serviceCreateVo.getServiceName(), ingressYaml);
             Yaml yaml = new Yaml(new Constructor(Ingress.class));
             Ingress ingress = yaml.load(ingressYaml);
             IntOrString servicePort = new IntOrStringBuilder().withIntVal(80).build();