Begin Refactoring RemovePodsViolatingTopologySpreadConstraint

go.mod

@@ -3,7 +3,6 @@ module sigs.k8s.io/descheduler
 go 1.14
 
 require (
-	github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
 	github.com/spf13/cobra v0.0.5
 	github.com/spf13/pflag v1.0.5
 	k8s.io/api v0.19.0-rc.4

pkg/api/types.go

@@ -72,9 +72,6 @@ type StrategyParameters struct {
 	Namespaces                        *Namespaces
 	ThresholdPriority                 *int32
 	ThresholdPriorityClassName        string
-	// TopologySpreadConstraints describes how a group of pods should be spread across topology
-	// domains. Descheduler will use these constraints to decide which pods to evict.
-	NamespacedTopologySpreadConstraints []NamespacedTopologySpreadConstraint
 }
 
 type Percentage float64
@@ -94,32 +91,3 @@ type PodsHavingTooManyRestarts struct {
 type RemoveDuplicates struct {
 	ExcludeOwnerKinds []string
 }
-
-type NamespacedTopologySpreadConstraint struct {
-	Namespace                 string
-	TopologySpreadConstraints []TopologySpreadConstraint
-}
-
-type TopologySpreadConstraint struct {
-	// MaxSkew describes the degree to which pods may be unevenly distributed.
-	// It's the maximum permitted difference between the number of matching pods in
-	// any two topology domains of a given topology type.
-	// For example, in a 3-zone cluster, currently pods with the same labelSelector
-	// are "spread" such that zone1 and zone2 each have one pod, but not zone3.
-	// - if MaxSkew is 1, incoming pod can only be scheduled to zone3 to become 1/1/1;
-	// scheduling it onto zone1(zone2) would make the ActualSkew(2) violate MaxSkew(1)
-	// - if MaxSkew is 2, incoming pod can be scheduled to any zone.
-	// It's a required value. Default value is 1 and 0 is not allowed.
-	MaxSkew int32
-	// TopologyKey is the key of node labels. Nodes that have a label with this key
-	// and identical values are considered to be in the same topology.
-	// We consider each <key, value> as a "bucket", and try to put balanced number
-	// of pods into each bucket.
-	// It's a required field.
-	TopologyKey string
-	// LabelSelector is used to find matching pods.
-	// Pods that match this label selector are counted to determine the number of pods
-	// in their corresponding topology domain.
-	// +optional
-	LabelSelector *metav1.LabelSelector
-}

pkg/api/v1alpha1/types.go

@@ -62,15 +62,14 @@ type Namespaces struct {
 
 // Besides Namespaces ThresholdPriority and ThresholdPriorityClassName only one of its members may be specified
 type StrategyParameters struct {
-	NodeResourceUtilizationThresholds   *NodeResourceUtilizationThresholds `json:"nodeResourceUtilizationThresholds,omitempty"`
-	NodeAffinityType                    []string                           `json:"nodeAffinityType,omitempty"`
-	PodsHavingTooManyRestarts           *PodsHavingTooManyRestarts         `json:"podsHavingTooManyRestarts,omitempty"`
-	MaxPodLifeTimeSeconds               *uint                              `json:"maxPodLifeTimeSeconds,omitempty"`
-	RemoveDuplicates                    *RemoveDuplicates                  `json:"removeDuplicates,omitempty"`
-	Namespaces                          *Namespaces                        `json:"namespaces"`
-	ThresholdPriority                   *int32                             `json:"thresholdPriority"`
-	ThresholdPriorityClassName          string                             `json:"thresholdPriorityClassName"`
-	NamespacedTopologySpreadConstraints []NamespacedTopologySpreadConstraint
+	NodeResourceUtilizationThresholds *NodeResourceUtilizationThresholds `json:"nodeResourceUtilizationThresholds,omitempty"`
+	NodeAffinityType                  []string                           `json:"nodeAffinityType,omitempty"`
+	PodsHavingTooManyRestarts         *PodsHavingTooManyRestarts         `json:"podsHavingTooManyRestarts,omitempty"`
+	MaxPodLifeTimeSeconds             *uint                              `json:"maxPodLifeTimeSeconds,omitempty"`
+	RemoveDuplicates                  *RemoveDuplicates                  `json:"removeDuplicates,omitempty"`
+	Namespaces                        *Namespaces                        `json:"namespaces"`
+	ThresholdPriority                 *int32                             `json:"thresholdPriority"`
+	ThresholdPriorityClassName        string                             `json:"thresholdPriorityClassName"`
 }
 
 type Percentage float64
@@ -90,32 +89,3 @@ type PodsHavingTooManyRestarts struct {
 type RemoveDuplicates struct {
 	ExcludeOwnerKinds []string `json:"excludeOwnerKinds,omitempty"`
 }
-
-type NamespacedTopologySpreadConstraint struct {
-	Namespace                 string
-	TopologySpreadConstraints []TopologySpreadConstraint
-}
-
-type TopologySpreadConstraint struct {
-	// MaxSkew describes the degree to which pods may be unevenly distributed.
-	// It's the maximum permitted difference between the number of matching pods in
-	// any two topology domains of a given topology type.
-	// For example, in a 3-zone cluster, currently pods with the same labelSelector
-	// are "spread" such that zone1 and zone2 each have one pod, but not zone3.
-	// - if MaxSkew is 1, incoming pod can only be scheduled to zone3 to become 1/1/1;
-	// scheduling it onto zone1(zone2) would make the ActualSkew(2) violate MaxSkew(1)
-	// - if MaxSkew is 2, incoming pod can be scheduled to any zone.
-	// It's a required value. Default value is 1 and 0 is not allowed.
-	MaxSkew int32
-	// TopologyKey is the key of node labels. Nodes that have a label with this key
-	// and identical values are considered to be in the same topology.
-	// We consider each <key, value> as a "bucket", and try to put balanced number
-	// of pods into each bucket.
-	// It's a required field.
-	TopologyKey string
-	// LabelSelector is used to find matching pods.
-	// Pods that match this label selector are counted to determine the number of pods
-	// in their corresponding topology domain.
-	// +optional
-	LabelSelector *metav1.LabelSelector
-}

pkg/descheduler/descheduler.go

@@ -70,14 +70,14 @@ func RunDeschedulerStrategies(ctx context.Context, rs *options.DeschedulerServer
 	sharedInformerFactory.WaitForCacheSync(stopChannel)
 
 	strategyFuncs := map[string]strategyFunction{
-		"RemoveDuplicates":                        strategies.RemoveDuplicatePods,
-		"LowNodeUtilization":                      strategies.LowNodeUtilization,
-		"RemovePodsViolatingInterPodAntiAffinity": strategies.RemovePodsViolatingInterPodAntiAffinity,
-		"RemovePodsViolatingNodeAffinity":         strategies.RemovePodsViolatingNodeAffinity,
-		"RemovePodsViolatingNodeTaints":           strategies.RemovePodsViolatingNodeTaints,
-		"RemovePodsHavingTooManyRestarts":         strategies.RemovePodsHavingTooManyRestarts,
-		"PodLifeTime":                             strategies.PodLifeTime,
-		"TopologySpreadConstraint":                strategies.TopologySpreadConstraint,
+		"RemoveDuplicates":                            strategies.RemoveDuplicatePods,
+		"LowNodeUtilization":                          strategies.LowNodeUtilization,
+		"RemovePodsViolatingInterPodAntiAffinity":     strategies.RemovePodsViolatingInterPodAntiAffinity,
+		"RemovePodsViolatingNodeAffinity":             strategies.RemovePodsViolatingNodeAffinity,
+		"RemovePodsViolatingNodeTaints":               strategies.RemovePodsViolatingNodeTaints,
+		"RemovePodsHavingTooManyRestarts":             strategies.RemovePodsHavingTooManyRestarts,
+		"PodLifeTime":                                 strategies.PodLifeTime,
+		"RemovePodsViolatingTopologySpreadConstraint": strategies.RemovePodsViolatingTopologySpreadConstraint,
 	}
 
 	nodeSelector := rs.NodeSelector