Merge pull request kosmos-io#75 from qiuming520/release-1.21

fix knodevolumebinding plugins hasKnodeTaint for Reserve and Unreserve function

Author: kosmos-robot

deploy/scheduler/deployment.yaml

@@ -76,6 +76,7 @@ data:
           filter:
             disabled:
               - name: "VolumeBinding"
+              - name: "TaintToleration"
             enabled:
               - name: "KNodeTaintToleration"
               - name: "KnodeVolumeBinding"

pkg/scheduler/lifted/helpers/tainttoleration.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2017 The Kubernetes Authors.
+Copyright 2019 The Kubernetes Authors.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@ limitations under the License.
 
 // This code is lifted from the Kubernetes codebase and make some slight modifications in order to avoid relying on the k8s.io/kubernetes package.
 // For reference:
-//https://github.com/kubernetes/component-helpers/blob/master/scheduling/corev1/helpers.go
+//https://github.com/kubernetes/component-helpers/blob/release-1.21/scheduling/corev1/helpers.go
 
 package helpers
 

pkg/scheduler/lifted/plugins/knodetainttoleration/knode_tainttoleration.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2017 The Kubernetes Authors.
+Copyright 2019 The Kubernetes Authors.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@ limitations under the License.
 
 // This code is lifted from the Kubernetes codebase and make some slight modifications in order to avoid relying on the k8s.io/kubernetes package.
 // For reference:
-// https://github.com/kubernetes/kubernetes/blob/master/pkg/scheduler/framework/plugins/tainttoleration/taint_toleration.go
+// https://github.com/kubernetes/kubernetes/blob/release-1.21/pkg/scheduler/framework/plugins/tainttoleration/taint_toleration.go
 
 package knodetainttoleration
 

pkg/scheduler/lifted/plugins/knodevolumebinding/knode_volume_binding.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2017 The Kubernetes Authors.
+Copyright 2019 The Kubernetes Authors.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@ limitations under the License.
 
 // This code is lifted from the Kubernetes codebase and make some slight modifications in order to avoid relying on the k8s.io/kubernetes package.
 // For reference:
-// https://github.com/kubernetes/kubernetes/blob/master/pkg/scheduler/framework/plugins/volumebinding/volume_binding.go
+// https://github.com/kubernetes/kubernetes/blob/release-1.21/pkg/scheduler/framework/plugins/volumebinding/volume_binding.go
 
 package knodevolumebinding
 
@@ -115,14 +115,6 @@ func (pl *VolumeBinding) PreBind(ctx context.Context, cs *framework.CycleState,
 
 // Reserve reserves volumes of pod and saves binding status in cycle state.
 func (pl *VolumeBinding) Reserve(_ context.Context, cs *framework.CycleState, p *corev1.Pod, nodeName string) *framework.Status {
-	nodeInfo, err := pl.frameworkHandler.SnapshotSharedLister().NodeInfos().Get(nodeName)
-	if err != nil {
-		return framework.NewStatus(framework.Error, "node not found")
-	}
-	if helpers.HasKnodeTaint(nodeInfo.Node()) {
-		return nil
-	}
-
 	state, err := getStateData(cs)
 	if err != nil {
 		return framework.AsStatus(err)
@@ -145,14 +137,6 @@ func (pl *VolumeBinding) Reserve(_ context.Context, cs *framework.CycleState, p
 // Unreserve clears assumed PV and PVC cache.
 // It's idempotent, and does nothing if no cache found for the given pod.
 func (pl *VolumeBinding) Unreserve(_ context.Context, cs *framework.CycleState, _ *corev1.Pod, nodeName string) {
-	nodeInfo, err := pl.frameworkHandler.SnapshotSharedLister().NodeInfos().Get(nodeName)
-	if err != nil {
-		return
-	}
-	if helpers.HasKnodeTaint(nodeInfo.Node()) {
-		return
-	}
-
 	s, err := getStateData(cs)
 	if err != nil {
 		return