修改获取pod列表状态判断

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

@@ -4,10 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.tencentcloudapi.common.Credential;
 import com.tencentcloudapi.common.profile.ClientProfile;
 import com.tencentcloudapi.tcr.v20190924.TcrClient;
-import com.tencentcloudapi.tcr.v20190924.models.DescribeImagePersonalRequest;
-import com.tencentcloudapi.tcr.v20190924.models.DescribeImagePersonalResponse;
-import com.tencentcloudapi.tcr.v20190924.models.DescribeRepositoryFilterPersonalRequest;
-import com.tencentcloudapi.tcr.v20190924.models.DescribeRepositoryFilterPersonalResponse;
+import com.tencentcloudapi.tcr.v20190924.models.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 

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

@@ -2,6 +2,7 @@ package cn.qg.holmes.service.k8s;
 
 import cn.qg.holmes.entity.k8s.DockerProject;
 import cn.qg.holmes.entity.k8s.ServiceCreateVo;
+import com.alibaba.fastjson.JSON;
 import io.fabric8.kubernetes.api.model.*;
 import io.fabric8.kubernetes.api.model.apps.Deployment;
 import io.fabric8.kubernetes.api.model.apps.DeploymentSpec;
@@ -187,13 +188,32 @@ public class K8sService {
                 map.put("serviceName", serviceName);
                 map.put("podName", podMetadata.getName());
                 map.put("labels", podMetadata.getLabels());
-                List<ContainerStatus> containerStatuses = pod.getStatus().getContainerStatuses();
                 map.put("image", pod.getStatus().getContainerStatuses().get(0).getImage());
                 map.put("imageId", pod.getStatus().getContainerStatuses().get(0).getImageID());
                 map.put("lanIp", pod.getStatus().getHostIP());
                 map.put("podIp", pod.getStatus().getPodIP());
                 map.put("startTime", pod.getStatus().getStartTime());
-                map.put("status", containerStatuses.get(0).getReady());
+                // 状态判断
+                List<ContainerStatus> containerStatuses = pod.getStatus().getContainerStatuses();
+                String status = "";
+                if (pod.getMetadata().getDeletionTimestamp() != null) {
+                    status = "Terminating";
+                } else {
+                    if (containerStatuses.size() == 0) {
+                        status = "Pending";
+                    } else {
+                        if (containerStatuses.get(0).getState().getWaiting() != null) {
+                            status = "ContainerCreating";
+                        }
+                        if (containerStatuses.get(0).getState().getRunning() != null && !containerStatuses.get(0).getReady()) {
+                            status = "Waiting";
+                        }
+                        if (containerStatuses.get(0).getState().getRunning() != null && containerStatuses.get(0).getReady()) {
+                            status = "Normal";
+                        }
+                    }
+                }
+                map.put("status", status);
                 result.add(map);
             }
         }
@@ -1950,8 +1970,14 @@ public class K8sService {
         return kubernetesClient.namespaces().create(namespace);
     }
 
+    public void podTest() {
+        Pod pod = kubernetesClient.pods().inNamespace("k8s").withName("notify-56fc55776b-5qshb").get();
+        System.out.println(JSON.toJSONString(pod.getStatus().getContainerStatuses().get(0)));
+    }
+
     public static void main(String[] args) {
         K8sService k8sService = new K8sService();
-        k8sService.createNewNamespace("test6", "dev", "黎博");
+//        k8sService.createNewNamespace("test6", "dev", "黎博");
+        k8sService.podTest();
     }
 }