From bfcd310a164075770afc5524f8b97b6f35792819 Mon Sep 17 00:00:00 2001 From: Julian Lawrence Date: Wed, 24 Aug 2022 16:12:24 -0700 Subject: [PATCH] removing dupe plugin interface check --- .../plugins/nodeutilization/highnodeutilization.go | 2 +- pkg/framework/plugins/nodeutilization/lownodeutilization.go | 2 +- pkg/framework/plugins/podlifetime/pod_lifetime.go | 5 +---- pkg/framework/plugins/removeduplicates/removeduplicates.go | 6 +++--- pkg/framework/plugins/removefailedpods/failedpods.go | 1 - .../removepodshavingtoomanyrestarts/toomanyrestarts.go | 5 +---- .../pod_antiaffinity.go | 1 - .../removepodsviolatingnodeaffinity/node_affinity.go | 1 - .../plugins/removepodsviolatingnodetaints/node_taint.go | 1 - 9 files changed, 7 insertions(+), 17 deletions(-) diff --git a/pkg/framework/plugins/nodeutilization/highnodeutilization.go b/pkg/framework/plugins/nodeutilization/highnodeutilization.go index 4b886874d..1eb47254c 100644 --- a/pkg/framework/plugins/nodeutilization/highnodeutilization.go +++ b/pkg/framework/plugins/nodeutilization/highnodeutilization.go @@ -19,6 +19,7 @@ package nodeutilization import ( "context" "fmt" + v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" "k8s.io/apimachinery/pkg/runtime" @@ -42,7 +43,6 @@ type HighNodeUtilization struct { podFilter func(pod *v1.Pod) bool } -var _ framework.Plugin = &HighNodeUtilization{} var _ framework.BalancePlugin = &HighNodeUtilization{} // NewHighNodeUtilization builds plugin from its arguments while passing a handle diff --git a/pkg/framework/plugins/nodeutilization/lownodeutilization.go b/pkg/framework/plugins/nodeutilization/lownodeutilization.go index 99d475b94..cc3ff2bff 100644 --- a/pkg/framework/plugins/nodeutilization/lownodeutilization.go +++ b/pkg/framework/plugins/nodeutilization/lownodeutilization.go @@ -19,6 +19,7 @@ package nodeutilization import ( "context" "fmt" + v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" "k8s.io/apimachinery/pkg/runtime" @@ -40,7 +41,6 @@ type LowNodeUtilization struct { podFilter func(pod *v1.Pod) bool } -var _ framework.Plugin = &LowNodeUtilization{} var _ framework.BalancePlugin = &LowNodeUtilization{} // NewLowNodeUtilization builds plugin from its arguments while passing a handle diff --git a/pkg/framework/plugins/podlifetime/pod_lifetime.go b/pkg/framework/plugins/podlifetime/pod_lifetime.go index a0ae2e639..7bb468c4c 100644 --- a/pkg/framework/plugins/podlifetime/pod_lifetime.go +++ b/pkg/framework/plugins/podlifetime/pod_lifetime.go @@ -34,10 +34,7 @@ import ( const PluginName = "PodLifeTime" -var ( - _ framework.Plugin = &PodLifeTime{} - _ framework.DeschedulePlugin = &PodLifeTime{} -) +var _ framework.DeschedulePlugin = &PodLifeTime{} // PodLifeTime evicts pods on the node that violate the max pod lifetime threshold type PodLifeTime struct { diff --git a/pkg/framework/plugins/removeduplicates/removeduplicates.go b/pkg/framework/plugins/removeduplicates/removeduplicates.go index 443fdcb5b..40973f1d3 100644 --- a/pkg/framework/plugins/removeduplicates/removeduplicates.go +++ b/pkg/framework/plugins/removeduplicates/removeduplicates.go @@ -19,13 +19,14 @@ package removeduplicates import ( "context" "fmt" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "math" "reflect" - "sigs.k8s.io/descheduler/pkg/utils" "sort" "strings" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "sigs.k8s.io/descheduler/pkg/utils" + v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/sets" @@ -50,7 +51,6 @@ type RemoveDuplicates struct { podFilter podutil.FilterFunc } -var _ framework.Plugin = &RemoveDuplicates{} var _ framework.BalancePlugin = &RemoveDuplicates{} type podOwner struct { diff --git a/pkg/framework/plugins/removefailedpods/failedpods.go b/pkg/framework/plugins/removefailedpods/failedpods.go index 57e2b3866..99ca628cf 100644 --- a/pkg/framework/plugins/removefailedpods/failedpods.go +++ b/pkg/framework/plugins/removefailedpods/failedpods.go @@ -42,7 +42,6 @@ type RemoveFailedPods struct { podFilter podutil.FilterFunc } -var _ framework.Plugin = &RemoveFailedPods{} var _ framework.DeschedulePlugin = &RemoveFailedPods{} // New builds plugin from its arguments while passing a handle diff --git a/pkg/framework/plugins/removepodshavingtoomanyrestarts/toomanyrestarts.go b/pkg/framework/plugins/removepodshavingtoomanyrestarts/toomanyrestarts.go index e39110735..c879f6c3e 100644 --- a/pkg/framework/plugins/removepodshavingtoomanyrestarts/toomanyrestarts.go +++ b/pkg/framework/plugins/removepodshavingtoomanyrestarts/toomanyrestarts.go @@ -42,10 +42,7 @@ type RemovePodsHavingTooManyRestarts struct { podFilter podutil.FilterFunc } -var ( - _ framework.Plugin = &RemovePodsHavingTooManyRestarts{} - _ framework.DeschedulePlugin = &RemovePodsHavingTooManyRestarts{} -) +var _ framework.DeschedulePlugin = &RemovePodsHavingTooManyRestarts{} // New builds plugin from its arguments while passing a handle func New(args runtime.Object, handle framework.Handle) (framework.Plugin, error) { diff --git a/pkg/framework/plugins/removepodsviolatinginterpodantiaffinity/pod_antiaffinity.go b/pkg/framework/plugins/removepodsviolatinginterpodantiaffinity/pod_antiaffinity.go index 87e00032a..454fa12ff 100644 --- a/pkg/framework/plugins/removepodsviolatinginterpodantiaffinity/pod_antiaffinity.go +++ b/pkg/framework/plugins/removepodsviolatinginterpodantiaffinity/pod_antiaffinity.go @@ -42,7 +42,6 @@ type RemovePodsViolatingInterPodAntiAffinity struct { podFilter podutil.FilterFunc } -var _ framework.Plugin = &RemovePodsViolatingInterPodAntiAffinity{} var _ framework.DeschedulePlugin = &RemovePodsViolatingInterPodAntiAffinity{} // New builds plugin from its arguments while passing a handle diff --git a/pkg/framework/plugins/removepodsviolatingnodeaffinity/node_affinity.go b/pkg/framework/plugins/removepodsviolatingnodeaffinity/node_affinity.go index 74b3b9be0..1143de354 100644 --- a/pkg/framework/plugins/removepodsviolatingnodeaffinity/node_affinity.go +++ b/pkg/framework/plugins/removepodsviolatingnodeaffinity/node_affinity.go @@ -39,7 +39,6 @@ type RemovePodsViolatingNodeAffinity struct { podFilter podutil.FilterFunc } -var _ framework.Plugin = &RemovePodsViolatingNodeAffinity{} var _ framework.DeschedulePlugin = &RemovePodsViolatingNodeAffinity{} // New builds plugin from its arguments while passing a handle diff --git a/pkg/framework/plugins/removepodsviolatingnodetaints/node_taint.go b/pkg/framework/plugins/removepodsviolatingnodetaints/node_taint.go index 3c3ec4182..e510ca3e2 100644 --- a/pkg/framework/plugins/removepodsviolatingnodetaints/node_taint.go +++ b/pkg/framework/plugins/removepodsviolatingnodetaints/node_taint.go @@ -42,7 +42,6 @@ type RemovePodsViolatingNodeTaints struct { podFilter podutil.FilterFunc } -var _ framework.Plugin = &RemovePodsViolatingNodeTaints{} var _ framework.DeschedulePlugin = &RemovePodsViolatingNodeTaints{} // New builds plugin from its arguments while passing a handle