Skip to content

K
k3s
Commit ba611194 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #39718 from foxish/remove-statefulset-special-case

Automatic merge from submit-queue (batch tested with PRs 39230, 39718) Remove special case for StatefulSets in scheduler **What this PR does / why we need it**: Removes special case for StatefulSet in scheduler code /ref: https://github.com/kubernetes/kubernetes/issues/39687 **Special notes for your reviewer**: **Release note**: ```release-note Scheduler treats StatefulSet pods as belonging to a single equivalence class. ```
parents 3ed7fb69 dda3b01d
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 12 deletions
plugin/pkg/scheduler/algorithmprovider/defaults/defaults.go
View file @ ba611194
...@@ -238,7 +238,7 @@ func GetEquivalencePod(pod *v1.Pod) interface{} { ...@@ -238,7 +238,7 @@ func GetEquivalencePod(pod *v1.Pod) interface{} {
// to be equivalent // to be equivalent
if len(pod.OwnerReferences) != 0 { if len(pod.OwnerReferences) != 0 {
for _, ref := range pod.OwnerReferences { for _, ref := range pod.OwnerReferences {
if *ref.Controller && isValidControllerKind(ref.Kind) { if *ref.Controller {
equivalencePod.ControllerRef = ref equivalencePod.ControllerRef = ref
// a pod can only belongs to one controller // a pod can only belongs to one controller
break break
...@@ -248,17 +248,6 @@ func GetEquivalencePod(pod *v1.Pod) interface{} { ...@@ -248,17 +248,6 @@ func GetEquivalencePod(pod *v1.Pod) interface{} {
return &equivalencePod return &equivalencePod
} }
// isValidControllerKind checks if a given controller's kind can be applied to equivalence pod algorithm.
func isValidControllerKind(kind string) bool {
switch kind {
// list of kinds that we cannot handle
case StatefulSetKind:
return false
default:
return true
}
}
// EquivalencePod is a group of pod attributes which can be reused as equivalence to schedule other pods. // EquivalencePod is a group of pod attributes which can be reused as equivalence to schedule other pods.
type EquivalencePod struct { type EquivalencePod struct {
ControllerRef metav1.OwnerReference ControllerRef metav1.OwnerReference
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment