allow to search deleted workload logs

Signed-off-by: huanggze <loganhuang@yunify.com>

pkg/models/log/logcollector.go

@@ -24,71 +24,11 @@ import (
 	"kubesphere.io/kubesphere/pkg/constants"
 	"kubesphere.io/kubesphere/pkg/informers"
 	"kubesphere.io/kubesphere/pkg/utils/stringutils"
-	"reflect"
 	"strconv"
 	"strings"
 	"time"
 )
 
-func in(value interface{}, container interface{}) int {
-	if container == nil {
-		return -1
-	}
-	containerValue := reflect.ValueOf(container)
-	switch reflect.TypeOf(container).Kind() {
-	case reflect.Slice, reflect.Array:
-		for i := 0; i < containerValue.Len(); i++ {
-			if containerValue.Index(i).Interface() == value {
-				return i
-			}
-		}
-	case reflect.Map:
-		if containerValue.MapIndex(reflect.ValueOf(value)).IsValid() {
-			return -1
-		}
-	default:
-		return -1
-	}
-	return -1
-}
-
-func getWorkloadName(name string, kind string) string {
-	if kind == "ReplicaSet" {
-		lastIndex := strings.LastIndex(name, "-")
-		if lastIndex >= 0 {
-			return name[:lastIndex]
-		}
-	}
-
-	return name
-}
-
-func matchLabel(label string, labelsMatch []string) bool {
-	var result = false
-
-	for _, labelMatch := range labelsMatch {
-		if strings.Compare(label, labelMatch) == 0 {
-			result = true
-			break
-		}
-	}
-
-	return result
-}
-
-func queryLabel(label string, labelsQuery []string) bool {
-	var result = false
-
-	for _, labelQuery := range labelsQuery {
-		if strings.Contains(label, labelQuery) {
-			result = true
-			break
-		}
-	}
-
-	return result
-}
-
 // list namespaces that match search conditions
 func MatchNamespace(nsFilter []string, nsQuery []string, wsFilter []string, wsQuery []string) (bool, []string) {
 
@@ -149,86 +89,3 @@ func MakeNamespaceCreationTimeMap(namespaces []string) map[string]string {
 
 	return namespaceWithCreationTime
 }
-
-func MatchWorkload(workloadMatch string, workloadQuery string, namespaces []string) (bool, []string) {
-	if workloadMatch == "" && workloadQuery == "" {
-		return false, nil
-	}
-
-	podLister := informers.SharedInformerFactory().Core().V1().Pods().Lister()
-	podList, err := podLister.List(labels.Everything())
-	if err != nil {
-		glog.Error("failed to list pods, error: ", err)
-		return true, nil
-	}
-
-	var pods []string
-
-	var hasMatch = false
-	var workloadsMatch []string
-	if workloadMatch != "" {
-		workloadsMatch = strings.Split(strings.Replace(workloadMatch, ",", " ", -1), " ")
-		hasMatch = true
-	}
-
-	var hasQuery = false
-	var workloadsQuery []string
-	if workloadQuery != "" {
-		workloadsQuery = strings.Split(strings.ToLower(strings.Replace(workloadQuery, ",", " ", -1)), " ")
-		hasQuery = true
-	}
-
-	if namespaces == nil {
-		for _, pod := range podList {
-			/*if len(pod.ObjectMeta.OwnerReferences) > 0 {
-				glog.Infof("List Pod %v:%v:%v", pod.Name, pod.ObjectMeta.OwnerReferences[0].Name, pod.ObjectMeta.OwnerReferences[0].Kind)
-			}*/
-			if len(pod.ObjectMeta.OwnerReferences) > 0 {
-				var podCanAppend = true
-				workloadName := getWorkloadName(pod.ObjectMeta.OwnerReferences[0].Name, pod.ObjectMeta.OwnerReferences[0].Kind)
-				if hasMatch {
-					if !matchLabel(workloadName, workloadsMatch) {
-						podCanAppend = false
-					}
-				}
-				if hasQuery {
-					if !queryLabel(strings.ToLower(workloadName), workloadsQuery) {
-						podCanAppend = false
-					}
-				}
-
-				if podCanAppend {
-					pods = append(pods, pod.Name)
-				}
-			}
-		}
-	} else {
-		for _, pod := range podList {
-			/*if len(pod.ObjectMeta.OwnerReferences) > 0 {
-				glog.Infof("List Pod %v:%v:%v", pod.Name, pod.ObjectMeta.OwnerReferences[0].Name, pod.ObjectMeta.OwnerReferences[0].Kind)
-			}*/
-			if len(pod.ObjectMeta.OwnerReferences) > 0 && in(pod.Namespace, namespaces) >= 0 {
-				var podCanAppend = true
-				workloadName := getWorkloadName(pod.ObjectMeta.OwnerReferences[0].Name, pod.ObjectMeta.OwnerReferences[0].Kind)
-				if hasMatch {
-					if !matchLabel(workloadName, workloadsMatch) {
-						podCanAppend = false
-					}
-				}
-				if hasQuery {
-					if !queryLabel(strings.ToLower(workloadName), workloadsQuery) {
-						podCanAppend = false
-					}
-				}
-
-				if podCanAppend {
-					pods = append(pods, pod.Name)
-				}
-			}
-		}
-	}
-
-	// if workloads is equal to nil, indicates no workload matched
-	// it causes the query to return no result
-	return pods == nil, pods
-}