github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-24 04:06:03 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #91336 from nodo/node-changed-unschedulable-pod-integration-tests

Browse Source 
Add test case for a pod becoming schedulable when a node is updated
This commit is contained in:
Kubernetes Prow Robot 2020-06-02 13:26:17 -07:00 committed by GitHub
commit a4e7db7cc3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 49 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
test/integration/scheduler/predicates_test.go
View File

@ -1051,8 +1051,35 @@ func TestUnschedulablePodBecomesSchedulable(t *testing.T) {
Name: "pod-1",
},
update: func(cs kubernetes.Interface) error {
_, err := createNode(cs, "node-1", nil)
return err
_, err := createNode(cs, "node-added", nil)
if err != nil {
return fmt.Errorf("cannot create node: %v", err)
}
return nil
},
},
{
name: "node gets taint removed",
init: func(cs kubernetes.Interface) error {
node, err := createNode(cs, "node-tainted", nil)
if err != nil {
return fmt.Errorf("cannot create node: %v", err)
}
taint := v1.Taint{Key: "test", Value: "test", Effect: v1.TaintEffectNoSchedule}
if err := testutils.AddTaintToNode(cs, node.Name, taint); err != nil {
return fmt.Errorf("cannot add taint to node: %v", err)
}
return nil
},
pod: &pausePodConfig{
Name: "pod-1",
},
update: func(cs kubernetes.Interface) error {
taint := v1.Taint{Key: "test", Value: "test", Effect: v1.TaintEffectNoSchedule}
if err := testutils.RemoveTaintOffNode(cs, "node-tainted", taint); err != nil {
return fmt.Errorf("cannot remove taint off node: %v", err)
}
return nil
},
},
// TODO(#91111): Add more test cases.
@ -1061,6 +1088,7 @@ func TestUnschedulablePodBecomesSchedulable(t *testing.T) {
t.Run(tt.name, func(t *testing.T) {
testCtx := initTest(t, "scheduler-informer")
defer testutils.CleanupTest(t, testCtx)
if tt.init != nil {
if err := tt.init(testCtx.ClientSet); err != nil {
t.Fatal(err)

22
test/integration/util/util.go
View File

@ -219,9 +219,25 @@ func AddTaintToNode(cs clientset.Interface, nodeName string, taint v1.Taint) err
if err != nil {
return err
}
copy := node.DeepCopy()
copy.Spec.Taints = append(copy.Spec.Taints, taint)
_, err = cs.CoreV1().Nodes().Update(context.TODO(), copy, metav1.UpdateOptions{})
node.Spec.Taints = append(node.Spec.Taints, taint)
_, err = cs.CoreV1().Nodes().Update(context.TODO(), node, metav1.UpdateOptions{})
return err
}
// RemoveTaintOffNode removes a specific taint from a node
func RemoveTaintOffNode(cs clientset.Interface, nodeName string, taint v1.Taint) error {
node, err := cs.CoreV1().Nodes().Get(context.TODO(), nodeName, metav1.GetOptions{})
if err != nil {
return err
}
var taints []v1.Taint
for _, t := range node.Spec.Taints {
if !t.MatchTaint(&taint) {
taints = append(taints, t)
}
}
node.Spec.Taints = taints
_, err = cs.CoreV1().Nodes().Update(context.TODO(), node, metav1.UpdateOptions{})
return err
}