diff --git a/pkg/scheduler/factory/factory.go b/pkg/scheduler/factory/factory.go index 11e30a71074..49a55410805 100644 --- a/pkg/scheduler/factory/factory.go +++ b/pkg/scheduler/factory/factory.go @@ -52,7 +52,6 @@ import ( "k8s.io/client-go/tools/cache" podutil "k8s.io/kubernetes/pkg/api/v1/pod" "k8s.io/kubernetes/pkg/apis/core/helper" - v1helper "k8s.io/kubernetes/pkg/apis/core/v1/helper" "k8s.io/kubernetes/pkg/features" kubeletapis "k8s.io/kubernetes/pkg/kubelet/apis" "k8s.io/kubernetes/pkg/scheduler" @@ -407,17 +406,8 @@ func (c *configFactory) invalidatePredicatesForPvUpdate(oldPV, newPV *v1.Persist } } if utilfeature.DefaultFeatureGate.Enabled(features.VolumeScheduling) { - oldAffinity, err := v1helper.GetStorageNodeAffinityFromAnnotation(oldPV.Annotations) - if err != nil { - glog.Errorf("cannot get node affinity fo *v1.PersistentVolume: %v", oldPV) - return - } - newAffinity, err := v1helper.GetStorageNodeAffinityFromAnnotation(newPV.Annotations) - if err != nil { - glog.Errorf("cannot get node affinity fo *v1.PersistentVolume: %v", newPV) - return - } - + oldAffinity := oldPV.Spec.NodeAffinity + newAffinity := newPV.Spec.NodeAffinity // If node affinity of PV is changed. if !reflect.DeepEqual(oldAffinity, newAffinity) { invalidPredicates.Insert(predicates.CheckVolumeBindingPred)