Break dependency on k8s.io/kubernetes

glide.yaml

@@ -10,8 +10,6 @@ import:
  version: kubernetes-1.17.0
 - package: k8s.io/apimachinery
  version: kubernetes-1.17.0
-- package: k8s.io/kubernetes
- version: release-1.17
 - package: k8s.io/code-generator
  version: kubernetes-1.17.0
 - package: k8s.io/gengo

pkg/descheduler/descheduler.go

@@ -28,6 +28,7 @@ import (
  eutils "sigs.k8s.io/descheduler/pkg/descheduler/evictions/utils"
  nodeutil "sigs.k8s.io/descheduler/pkg/descheduler/node"
  "sigs.k8s.io/descheduler/pkg/descheduler/strategies"
+ "sigs.k8s.io/descheduler/pkg/utils"
 )
 
 func Run(rs *options.DeschedulerServer) error {
@@ -65,7 +66,7 @@ func RunDeschedulerStrategies(rs *options.DeschedulerServer, deschedulerPolicy *
  return nil
  }
 
- nodePodCount := strategies.InitializeNodePodCount(nodes)
+ nodePodCount := utils.InitializeNodePodCount(nodes)
  wait.Until(func() {
  strategies.RemoveDuplicatePods(rs, deschedulerPolicy.Strategies["RemoveDuplicates"], evictionPolicyGroupVersion, nodes, nodePodCount)
  strategies.LowNodeUtilization(rs, deschedulerPolicy.Strategies["LowNodeUtilization"], evictionPolicyGroupVersion, nodes, nodePodCount)

pkg/descheduler/pod/pods.go

@@ -21,9 +21,7 @@ import (
  metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
  "k8s.io/apimachinery/pkg/fields"
  clientset "k8s.io/client-go/kubernetes"
- api "k8s.io/kubernetes/pkg/apis/core"
- "k8s.io/kubernetes/pkg/apis/core/v1/helper/qos"
- "k8s.io/kubernetes/pkg/kubelet/types"
+ "sigs.k8s.io/descheduler/pkg/utils"
 )
 
 const (
@@ -57,7 +55,7 @@ func ListEvictablePodsOnNode(client clientset.Interface, node *v1.Node, evictLoc
 }
 
 func ListPodsOnANode(client clientset.Interface, node *v1.Node) ([]*v1.Pod, error) {
- fieldSelector, err := fields.ParseSelector("spec.nodeName=" + node.Name + ",status.phase!=" + string(api.PodSucceeded) + ",status.phase!=" + string(api.PodFailed))
+ fieldSelector, err := fields.ParseSelector("spec.nodeName=" + node.Name + ",status.phase!=" + string(v1.PodSucceeded) + ",status.phase!=" + string(v1.PodFailed))
  if err != nil {
  return []*v1.Pod{}, err
  }
@@ -76,19 +74,19 @@ func ListPodsOnANode(client clientset.Interface, node *v1.Node) ([]*v1.Pod, erro
 }
 
 func IsCriticalPod(pod *v1.Pod) bool {
- return types.IsCriticalPod(pod)
+ return utils.IsCriticalPod(pod)
 }
 
 func IsBestEffortPod(pod *v1.Pod) bool {
- return qos.GetPodQOS(pod) == v1.PodQOSBestEffort
+ return utils.GetPodQOS(pod) == v1.PodQOSBestEffort
 }
 
 func IsBurstablePod(pod *v1.Pod) bool {
- return qos.GetPodQOS(pod) == v1.PodQOSBurstable
+ return utils.GetPodQOS(pod) == v1.PodQOSBurstable
 }
 
 func IsGuaranteedPod(pod *v1.Pod) bool {
- return qos.GetPodQOS(pod) == v1.PodQOSGuaranteed
+ return utils.GetPodQOS(pod) == v1.PodQOSGuaranteed
 }
 
 func IsDaemonsetPod(ownerRefList []metav1.OwnerReference) bool {
@@ -102,8 +100,7 @@ func IsDaemonsetPod(ownerRefList []metav1.OwnerReference) bool {
 
 // IsMirrorPod checks whether the pod is a mirror pod.
 func IsMirrorPod(pod *v1.Pod) bool {
- _, found := pod.ObjectMeta.Annotations[types.ConfigMirrorAnnotationKey]
- return found
+ return utils.IsMirrorPod(pod)
 }
 
 // HaveEvictAnnotation checks if the pod have evict annotation

pkg/descheduler/pod/pods_test.go

@@ -17,11 +17,11 @@ limitations under the License.
 package pod
 
 import (
+ "sigs.k8s.io/descheduler/pkg/utils"
  "testing"
 
  v1 "k8s.io/api/core/v1"
  "k8s.io/apimachinery/pkg/api/resource"
- "k8s.io/kubernetes/pkg/apis/scheduling"
  "sigs.k8s.io/descheduler/test"
 )
 
@@ -209,7 +209,7 @@ func TestPodTypes(t *testing.T) {
  // A Critical Pod.
  p5.Namespace = "kube-system"
  p5.Annotations = test.GetCriticalPodAnnotation()
- systemCriticalPriority := scheduling.SystemCriticalPriority
+ systemCriticalPriority := utils.SystemCriticalPriority
  p5.Spec.Priority = &systemCriticalPriority
  if !IsMirrorPod(p4) {
  t.Errorf("Expected p4 to be a mirror pod.")

pkg/descheduler/strategies/duplicates.go

@@ -27,6 +27,7 @@ import (
  "sigs.k8s.io/descheduler/pkg/api"
  "sigs.k8s.io/descheduler/pkg/descheduler/evictions"
  podutil "sigs.k8s.io/descheduler/pkg/descheduler/pod"
+ "sigs.k8s.io/descheduler/pkg/utils"
 )
 
 //type creator string
@@ -35,15 +36,15 @@ type DuplicatePodsMap map[string][]*v1.Pod
 // RemoveDuplicatePods removes the duplicate pods on node. This strategy evicts all duplicate pods on node.
 // A pod is said to be a duplicate of other if both of them are from same creator, kind and are within the same
 // namespace. As of now, this strategy won't evict daemonsets, mirror pods, critical pods and pods with local storages.
-func RemoveDuplicatePods(ds *options.DeschedulerServer, strategy api.DeschedulerStrategy, policyGroupVersion string, nodes []*v1.Node, nodepodCount nodePodEvictedCount) {
+func RemoveDuplicatePods(ds *options.DeschedulerServer, strategy api.DeschedulerStrategy, policyGroupVersion string, nodes []*v1.Node, nodepodCount utils.NodePodEvictedCount) {
  if !strategy.Enabled {
  return
  }
  deleteDuplicatePods(ds.Client, policyGroupVersion, nodes, ds.DryRun, nodepodCount, ds.MaxNoOfPodsToEvictPerNode, ds.EvictLocalStoragePods)
 }
 
 // deleteDuplicatePods evicts the pod from node and returns the count of evicted pods.
-func deleteDuplicatePods(client clientset.Interface, policyGroupVersion string, nodes []*v1.Node, dryRun bool, nodepodCount nodePodEvictedCount, maxPodsToEvict int, evictLocalStoragePods bool) int {
+func deleteDuplicatePods(client clientset.Interface, policyGroupVersion string, nodes []*v1.Node, dryRun bool, nodepodCount utils.NodePodEvictedCount, maxPodsToEvict int, evictLocalStoragePods bool) int {
  podsEvicted := 0
  for _, node := range nodes {
  klog.V(1).Infof("Processing node: %#v", node.Name)

pkg/descheduler/strategies/lownodeutilization.go

@@ -23,13 +23,12 @@ import (
  "k8s.io/apimachinery/pkg/api/resource"
  clientset "k8s.io/client-go/kubernetes"
  "k8s.io/klog"
- helper "k8s.io/kubernetes/pkg/api/v1/resource"
-
  "sigs.k8s.io/descheduler/cmd/descheduler/app/options"
  "sigs.k8s.io/descheduler/pkg/api"
  "sigs.k8s.io/descheduler/pkg/descheduler/evictions"
  nodeutil "sigs.k8s.io/descheduler/pkg/descheduler/node"
  podutil "sigs.k8s.io/descheduler/pkg/descheduler/pod"
+ "sigs.k8s.io/descheduler/pkg/utils"
 )
 
 type NodeUsageMap struct {
@@ -44,7 +43,7 @@ type NodeUsageMap struct {
 
 type NodePodsMap map[*v1.Node][]*v1.Pod
 
-func LowNodeUtilization(ds *options.DeschedulerServer, strategy api.DeschedulerStrategy, evictionPolicyGroupVersion string, nodes []*v1.Node, nodepodCount nodePodEvictedCount) {
+func LowNodeUtilization(ds *options.DeschedulerServer, strategy api.DeschedulerStrategy, evictionPolicyGroupVersion string, nodes []*v1.Node, nodepodCount utils.NodePodEvictedCount) {
  if !strategy.Enabled {
  return
  }
@@ -155,7 +154,7 @@ func classifyNodes(npm NodePodsMap, thresholds api.ResourceThresholds, targetThr
 // evictPodsFromTargetNodes evicts pods based on priority, if all the pods on the node have priority, if not
 // evicts them based on QoS as fallback option.
 // TODO: @ravig Break this function into smaller functions.
-func evictPodsFromTargetNodes(client clientset.Interface, evictionPolicyGroupVersion string, targetNodes, lowNodes []NodeUsageMap, targetThresholds api.ResourceThresholds, dryRun bool, maxPodsToEvict int, nodepodCount nodePodEvictedCount) int {
+func evictPodsFromTargetNodes(client clientset.Interface, evictionPolicyGroupVersion string, targetNodes, lowNodes []NodeUsageMap, targetThresholds api.ResourceThresholds, dryRun bool, maxPodsToEvict int, nodepodCount utils.NodePodEvictedCount) int {
  podsEvicted := 0
 
  SortNodesByUsage(targetNodes)
@@ -240,8 +239,8 @@ func evictPods(inputPods []*v1.Pod,
  if maxPodsToEvict > 0 && *podsEvicted+1 > maxPodsToEvict {
  break
  }
- cUsage := helper.GetResourceRequest(pod, v1.ResourceCPU)
- mUsage := helper.GetResourceRequest(pod, v1.ResourceMemory)
+ cUsage := utils.GetResourceRequest(pod, v1.ResourceCPU)
+ mUsage := utils.GetResourceRequest(pod, v1.ResourceMemory)
  success, err := evictions.EvictPod(client, pod, evictionPolicyGroupVersion, dryRun)
  if !success {
  klog.Warningf("Error when evicting pod: %#v (%#v)", pod.Name, err)
@@ -373,7 +372,7 @@ func NodeUtilization(node *v1.Node, pods []*v1.Pod, evictLocalStoragePods bool)
  gPods = append(gPods, pod)
  }
 
- req, _ := helper.PodRequestsAndLimits(pod)
+ req, _ := utils.PodRequestsAndLimits(pod)
  for name, quantity := range req {
  if name == v1.ResourceCPU || name == v1.ResourceMemory {
  if value, ok := totalReqs[name]; !ok {

pkg/descheduler/strategies/node_affinity.go

@@ -19,6 +19,7 @@ package strategies
 import (
  "k8s.io/api/core/v1"
  "k8s.io/klog"
+ "sigs.k8s.io/descheduler/pkg/utils"
 
  "sigs.k8s.io/descheduler/cmd/descheduler/app/options"
  "sigs.k8s.io/descheduler/pkg/api"
@@ -27,11 +28,11 @@ import (
  podutil "sigs.k8s.io/descheduler/pkg/descheduler/pod"
 )
 
-func RemovePodsViolatingNodeAffinity(ds *options.DeschedulerServer, strategy api.DeschedulerStrategy, evictionPolicyGroupVersion string, nodes []*v1.Node, nodePodCount nodePodEvictedCount) {
+func RemovePodsViolatingNodeAffinity(ds *options.DeschedulerServer, strategy api.DeschedulerStrategy, evictionPolicyGroupVersion string, nodes []*v1.Node, nodePodCount utils.NodePodEvictedCount) {
  removePodsViolatingNodeAffinityCount(ds, strategy, evictionPolicyGroupVersion, nodes, nodePodCount, ds.MaxNoOfPodsToEvictPerNode, ds.EvictLocalStoragePods)
 }
 
-func removePodsViolatingNodeAffinityCount(ds *options.DeschedulerServer, strategy api.DeschedulerStrategy, evictionPolicyGroupVersion string, nodes []*v1.Node, nodepodCount nodePodEvictedCount, maxPodsToEvict int, evictLocalStoragePods bool) int {
+func removePodsViolatingNodeAffinityCount(ds *options.DeschedulerServer, strategy api.DeschedulerStrategy, evictionPolicyGroupVersion string, nodes []*v1.Node, nodepodCount utils.NodePodEvictedCount, maxPodsToEvict int, evictLocalStoragePods bool) int {
  evictedPodCount := 0
  if !strategy.Enabled {
  return evictedPodCount

pkg/descheduler/strategies/node_taint.go

@@ -21,6 +21,7 @@ import (
  "sigs.k8s.io/descheduler/pkg/api"
  "sigs.k8s.io/descheduler/pkg/descheduler/evictions"
  podutil "sigs.k8s.io/descheduler/pkg/descheduler/pod"
+ "sigs.k8s.io/descheduler/pkg/utils"
 
  "k8s.io/api/core/v1"
  clientset "k8s.io/client-go/kubernetes"
@@ -33,15 +34,15 @@ const (
 )
 
 // RemovePodsViolatingNodeTaints with elimination strategy
-func RemovePodsViolatingNodeTaints(ds *options.DeschedulerServer, strategy api.DeschedulerStrategy, policyGroupVersion string, nodes []*v1.Node, nodePodCount nodePodEvictedCount) {
+func RemovePodsViolatingNodeTaints(ds *options.DeschedulerServer, strategy api.DeschedulerStrategy, policyGroupVersion string, nodes []*v1.Node, nodePodCount utils.NodePodEvictedCount) {
  if !strategy.Enabled {
  return
  }
  deletePodsViolatingNodeTaints(ds.Client, policyGroupVersion, nodes, ds.DryRun, nodePodCount, ds.MaxNoOfPodsToEvictPerNode, ds.EvictLocalStoragePods)
 }
 
 // deletePodsViolatingNodeTaints evicts pods on the node which violate NoSchedule Taints on nodes
-func deletePodsViolatingNodeTaints(client clientset.Interface, policyGroupVersion string, nodes []*v1.Node, dryRun bool, nodePodCount nodePodEvictedCount, maxPodsToEvict int, evictLocalStoragePods bool) int {
+func deletePodsViolatingNodeTaints(client clientset.Interface, policyGroupVersion string, nodes []*v1.Node, dryRun bool, nodePodCount utils.NodePodEvictedCount, maxPodsToEvict int, evictLocalStoragePods bool) int {
  podsEvicted := 0
  for _, node := range nodes {
  klog.V(1).Infof("Processing node: %#v\n", node.Name)

pkg/descheduler/strategies/pod_antiaffinity.go

@@ -21,24 +21,24 @@ import (
  "sigs.k8s.io/descheduler/pkg/api"
  "sigs.k8s.io/descheduler/pkg/descheduler/evictions"
  podutil "sigs.k8s.io/descheduler/pkg/descheduler/pod"
+ "sigs.k8s.io/descheduler/pkg/utils"
 
  "k8s.io/api/core/v1"
  metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
  clientset "k8s.io/client-go/kubernetes"
  "k8s.io/klog"
- priorityutil "k8s.io/kubernetes/pkg/scheduler/algorithm/priorities/util"
 )
 
 // RemovePodsViolatingInterPodAntiAffinity with elimination strategy
-func RemovePodsViolatingInterPodAntiAffinity(ds *options.DeschedulerServer, strategy api.DeschedulerStrategy, policyGroupVersion string, nodes []*v1.Node, nodePodCount nodePodEvictedCount) {
+func RemovePodsViolatingInterPodAntiAffinity(ds *options.DeschedulerServer, strategy api.DeschedulerStrategy, policyGroupVersion string, nodes []*v1.Node, nodePodCount utils.NodePodEvictedCount) {
  if !strategy.Enabled {
  return
  }
  removePodsWithAffinityRules(ds.Client, policyGroupVersion, nodes, ds.DryRun, nodePodCount, ds.MaxNoOfPodsToEvictPerNode, ds.EvictLocalStoragePods)
 }
 
 // removePodsWithAffinityRules evicts pods on the node which are having a pod affinity rules.
-func removePodsWithAffinityRules(client clientset.Interface, policyGroupVersion string, nodes []*v1.Node, dryRun bool, nodePodCount nodePodEvictedCount, maxPodsToEvict int, evictLocalStoragePods bool) int {
+func removePodsWithAffinityRules(client clientset.Interface, policyGroupVersion string, nodes []*v1.Node, dryRun bool, nodePodCount utils.NodePodEvictedCount, maxPodsToEvict int, evictLocalStoragePods bool) int {
  podsEvicted := 0
  for _, node := range nodes {
  klog.V(1).Infof("Processing node: %#v\n", node.Name)
@@ -77,14 +77,14 @@ func checkPodsWithAntiAffinityExist(pod *v1.Pod, pods []*v1.Pod) bool {
  affinity := pod.Spec.Affinity
  if affinity != nil && affinity.PodAntiAffinity != nil {
  for _, term := range getPodAntiAffinityTerms(affinity.PodAntiAffinity) {
- namespaces := priorityutil.GetNamespacesFromPodAffinityTerm(pod, &term)
+ namespaces := utils.GetNamespacesFromPodAffinityTerm(pod, &term)
  selector, err := metav1.LabelSelectorAsSelector(term.LabelSelector)
  if err != nil {
  klog.Infof("%v", err)
  return false
  }
  for _, existingPod := range pods {
- if existingPod.Name != pod.Name && priorityutil.PodMatchesTermsNamespaceAndSelector(existingPod, namespaces, selector) {
+ if existingPod.Name != pod.Name && utils.PodMatchesTermsNamespaceAndSelector(existingPod, namespaces, selector) {
  return true
  }
  }