github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 05:27:21 +00:00
Code Issues Projects Releases Wiki Activity

Renamed variable containing master to control plane

Browse Source
This commit is contained in:
mgutierrez98 2021-06-25 21:20:29 +00:00
parent 017b359770
commit 80171465b3
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
test/e2e/framework/node/wait_test.go
View File

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