Merge branch 'main' of https://bdgit.educoder.net/pgpc5xf4t/hami

server/internal/data/pod.go

@@ -59,7 +59,8 @@ func (r *podRepo) onAddPod(obj interface{}) {
 		return
 	}
 	nodeID, ok := pod.Annotations[util.AssignedNodeAnnotations]
-	if !ok {
+	tpiID := pod.Labels["tpi-id"]
+	if !ok && tpiID == "" {
 		return
 	}
 	if biz.IsPodInTerminatedState(pod) {
@@ -121,7 +122,10 @@ func (r *podRepo) fetchContainerInfo(pod *corev1.Pod) []*biz.Container {
 		copier.Copy(&bizContainerDevices, pds)
 	}
 	if len(bizContainerDevices) < 1 {
-		return containers
+		for range pod.Spec.Containers {
+			bizContainerDevices = append(bizContainerDevices, biz.ContainerDevices{})
+		}
+		//return containers
 	}
 
 	ctrIdMaps := map[string]string{}

server/internal/service/container.go

@@ -105,6 +105,8 @@ func (s *ContainerService) GetAllContainers(ctx context.Context, req *pb.GetAllC
 		containerReply.NodeUid = container.NodeUID
 		containerReply.Namespace = container.Namespace
 		containerReply.Priority = container.Priority
+		containerReply.RequestedCpuCores = container.RequestedCpuCores
+		containerReply.RequestedMemory = container.RequestedMemory
 		for _, containerDevice := range container.ContainerDevices {
 			deviceID := containerDevice.UUID
 			if device, err := s.node.FindDeviceByAliasId(containerDevice.UUID); err == nil {
@@ -125,9 +127,6 @@ func (s *ContainerService) GetAllContainers(ctx context.Context, req *pb.GetAllC
 			containerReply.Type = containerDevice.Type
 			containerReply.AllocatedDevices++
 		}
-		if containerReply.DeviceIds == nil {
-			continue
-		}
 
 		resourcePoolNames, err := database.QueryResourceNamesByNodeName(container.NodeName)
 		if err != nil {