Skip to content

Commit 56ad332

Browse files
committed
Fix for a toleration related check and Changes to identify control-plane nodes via control-plane taint as well
1 parent a3dba9f commit 56ad332

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

test/e2e/framework/kubeclient.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -653,7 +653,7 @@ func podToleratesNodeTaints(pod *v1.Pod, nodeInfo *scheduler.NodeInfo, filter fu
653653

654654
_, matchingFlag := v1helper.FindMatchingUntoleratedTaint(taints, pod.Spec.Tolerations, filter)
655655

656-
if matchingFlag {
656+
if !matchingFlag {
657657
return true, nil
658658
}
659659
return false, nil

test/e2e/framework/pvc_util.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1050,7 +1050,7 @@ func (j *PVCTestJig) CheckDataPersistenceWithDeployment(pvcName string, ns strin
10501050
taintIsMaster := false
10511051
if node.Spec.Unschedulable == false {
10521052
for _, taint := range node.Spec.Taints {
1053-
taintIsMaster = taint.Key == "node-role.kubernetes.io/master"
1053+
taintIsMaster = (taint.Key == "node-role.kubernetes.io/master" || taint.Key == "node-role.kubernetes.io/control-plane")
10541054
}
10551055
if !taintIsMaster {
10561056
schedulableNodeFound = true

0 commit comments

Comments
 (0)