Merge pull request #103219 from mgutierrez98/refactor-wait_go

Renamed variable within wait_test containing master to control plane
This commit is contained in:
Kubernetes Prow Robot 2021-06-30 20:59:54 -07:00 committed by GitHub
commit ea0098b811
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -31,7 +31,7 @@ import (
// since single node checks are in TestReadyForTests.
func TestCheckReadyForTests(t *testing.T) {
// This is a duplicate definition of the constant in pkg/controller/service/controller.go
labelNodeRoleMaster := "node-role.kubernetes.io/master"
labelNodeRoleControlPlane := "node-role.kubernetes.io/control-plane"
fromVanillaNode := func(f func(*v1.Node)) v1.Node {
vanillaNode := &v1.Node{
@ -62,11 +62,11 @@ func TestCheckReadyForTests(t *testing.T) {
},
expected: true,
}, {
desc: "Default value for nonblocking taints tolerates master taint",
nonblockingTaints: `node-role.kubernetes.io/master`,
desc: "Default value for nonblocking taints tolerates control plane taint",
nonblockingTaints: `node-role.kubernetes.io/control-plane`,
nodes: []v1.Node{
fromVanillaNode(func(n *v1.Node) {
n.Spec.Taints = []v1.Taint{{Key: labelNodeRoleMaster, Effect: v1.TaintEffectNoSchedule}}
n.Spec.Taints = []v1.Taint{{Key: labelNodeRoleControlPlane, Effect: v1.TaintEffectNoSchedule}}
}),
},
expected: true,