Add excludedownerref kinds parameter for duplicates strategy

pkg/api/types.go

@@ -50,6 +50,7 @@ type StrategyParameters struct {
 	NodeAffinityType                  []string
 	PodsHavingTooManyRestarts         *PodsHavingTooManyRestarts
 	MaxPodLifeTimeSeconds             *uint
+	RemoveDuplicates                  *RemoveDuplicates
 }
 
 type Percentage float64
@@ -65,3 +66,7 @@ type PodsHavingTooManyRestarts struct {
 	PodRestartThreshold     int32
 	IncludingInitContainers bool
 }
+
+type RemoveDuplicates struct {
+	ExcludeOwnerKinds []string
+}

pkg/api/v1alpha1/types.go

@@ -50,6 +50,7 @@ type StrategyParameters struct {
 	NodeAffinityType                  []string                           `json:"nodeAffinityType,omitempty"`
 	PodsHavingTooManyRestarts         *PodsHavingTooManyRestarts         `json:"podsHavingTooManyRestarts,omitempty"`
 	MaxPodLifeTimeSeconds             *uint                              `json:"maxPodLifeTimeSeconds,omitempty"`
+	RemoveDuplicates                  *RemoveDuplicates                  `json:"removeDuplicates,omitempty"`
 }
 
 type Percentage float64
@@ -65,3 +66,7 @@ type PodsHavingTooManyRestarts struct {
 	PodRestartThreshold     int32 `json:"podRestartThreshold,omitempty"`
 	IncludingInitContainers bool  `json:"includingInitContainers,omitempty"`
 }
+
+type RemoveDuplicates struct {
+	ExcludeOwnerKinds []string `json:"excludeOwnerKinds,omitempty"`
+}

pkg/descheduler/strategies/duplicates.go

@@ -23,6 +23,8 @@ import (
 	"strings"
 
 	"k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/util/sets"
 	clientset "k8s.io/client-go/kubernetes"
 	"k8s.io/klog"
 
@@ -45,7 +47,7 @@ func RemoveDuplicatePods(
 ) {
 	for _, node := range nodes {
 		klog.V(1).Infof("Processing node: %#v", node.Name)
-		duplicatePods := listDuplicatePodsOnANode(ctx, client, node, evictLocalStoragePods)
+		duplicatePods := listDuplicatePodsOnANode(ctx, client, node, strategy, evictLocalStoragePods)
 		for _, pod := range duplicatePods {
 			if _, err := podEvictor.EvictPod(ctx, pod, node); err != nil {
 				break
@@ -56,7 +58,7 @@ func RemoveDuplicatePods(
 
 // listDuplicatePodsOnANode lists duplicate pods on a given node.
 // It checks for pods which have the same owner and have at least 1 container with the same image spec
-func listDuplicatePodsOnANode(ctx context.Context, client clientset.Interface, node *v1.Node, evictLocalStoragePods bool) []*v1.Pod {
+func listDuplicatePodsOnANode(ctx context.Context, client clientset.Interface, node *v1.Node, strategy api.DeschedulerStrategy, evictLocalStoragePods bool) []*v1.Pod {
 	pods, err := podutil.ListEvictablePodsOnNode(ctx, client, node, evictLocalStoragePods)
 	if err != nil {
 		return nil
@@ -79,32 +81,48 @@ func listDuplicatePodsOnANode(ctx context.Context, client clientset.Interface, n
 	duplicateKeysMap := map[string][][]string{}
 	for _, pod := range pods {
 		ownerRefList := podutil.OwnerRef(pod)
-		podKeys := make([]string, 0, len(ownerRefList)*len(pod.Spec.Containers))
+		if hasExcludedOwnerRefKind(ownerRefList, strategy) {
+			continue
+		}
+		podContainerKeys := make([]string, 0, len(ownerRefList)*len(pod.Spec.Containers))
 		for _, ownerRef := range ownerRefList {
 			for _, container := range pod.Spec.Containers {
 				// Namespace/Kind/Name should be unique for the cluster.
 				// We also consider the image, as 2 pods could have the same owner but serve different purposes
 				// So any non-unique Namespace/Kind/Name/Image pattern is a duplicate pod.
 				s := strings.Join([]string{pod.ObjectMeta.Namespace, ownerRef.Kind, ownerRef.Name, container.Image}, "/")
-				podKeys = append(podKeys, s)
+				podContainerKeys = append(podContainerKeys, s)
 			}
 		}
-		sort.Strings(podKeys)
+		sort.Strings(podContainerKeys)
 
 		// If there have been any other pods with the same first "key", look through all the lists to see if any match
-		if existing, ok := duplicateKeysMap[podKeys[0]]; ok {
+		if existing, ok := duplicateKeysMap[podContainerKeys[0]]; ok {
 			for _, keys := range existing {
-				if reflect.DeepEqual(keys, podKeys) {
+				if reflect.DeepEqual(keys, podContainerKeys) {
 					duplicatePods = append(duplicatePods, pod)
 					break
 				}
 				// Found no matches, add this list of keys to the list of lists that have the same first key
-				duplicateKeysMap[podKeys[0]] = append(duplicateKeysMap[podKeys[0]], podKeys)
+				duplicateKeysMap[podContainerKeys[0]] = append(duplicateKeysMap[podContainerKeys[0]], podContainerKeys)
 			}
 		} else {
 			// This is the first pod we've seen that has this first "key" entry
-			duplicateKeysMap[podKeys[0]] = [][]string{podKeys}
+			duplicateKeysMap[podContainerKeys[0]] = [][]string{podContainerKeys}
 		}
 	}
 	return duplicatePods
 }
+
+func hasExcludedOwnerRefKind(ownerRefs []metav1.OwnerReference, strategy api.DeschedulerStrategy) bool {
+	if strategy.Params.RemoveDuplicates == nil {
+		return false
+	}
+	exclude := sets.NewString(strategy.Params.RemoveDuplicates.ExcludeOwnerKinds...)
+	for _, owner := range ownerRefs {
+		if exclude.Has(owner.Kind) {
+			return true
+		}
+	}
+	return false
+}