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

Merge pull request #110137 from neolit123/1.25-update-master-label-taint

Browse Source 
kubeadm: cleanup OldControlPlaneTaint from unit tests
This commit is contained in:
Kubernetes Prow Robot 2022-05-19 22:05:13 -07:00 committed by GitHub
commit 3308ce1caf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
cmd/kubeadm/app/phases/markcontrolplane/markcontrolplane_test.go
View File

@ -45,26 +45,12 @@ func TestMarkControlPlane(t *testing.T) {
expectedPatch string expectedPatch string
}{ }{
{ {
name: "control-plane label and taint missing", name: "apply default labels",
existingLabels: []string{""},
existingTaints: nil,
newTaints: []v1.Taint{kubeadmconstants.OldControlPlaneTaint},
expectedPatch: `{"metadata":{"labels":{"node-role.kubernetes.io/control-plane":"","node.kubernetes.io/exclude-from-external-load-balancers":""}},"spec":{"taints":[{"effect":"NoSchedule","key":"node-role.kubernetes.io/master"}]}}`,
},
{
name: "control-plane label and taint missing but taint not wanted",
existingLabels: []string{""}, existingLabels: []string{""},
existingTaints: nil, existingTaints: nil,
newTaints: nil, newTaints: nil,
expectedPatch: `{"metadata":{"labels":{"node-role.kubernetes.io/control-plane":"","node.kubernetes.io/exclude-from-external-load-balancers":""}}}`, expectedPatch: `{"metadata":{"labels":{"node-role.kubernetes.io/control-plane":"","node.kubernetes.io/exclude-from-external-load-balancers":""}}}`,
}, },
{
name: "control-plane label missing",
existingLabels: []string{""},
existingTaints: []v1.Taint{kubeadmconstants.OldControlPlaneTaint},
newTaints: []v1.Taint{kubeadmconstants.OldControlPlaneTaint},
expectedPatch: `{"metadata":{"labels":{"node-role.kubernetes.io/control-plane":"","node.kubernetes.io/exclude-from-external-load-balancers":""}}}`,
},
{ {
name: "control-plane taint missing", name: "control-plane taint missing",
existingLabels: []string{ existingLabels: []string{
@ -72,8 +58,8 @@ func TestMarkControlPlane(t *testing.T) {
kubeadmconstants.LabelExcludeFromExternalLB, kubeadmconstants.LabelExcludeFromExternalLB,
}, },
existingTaints: nil, existingTaints: nil,
newTaints: []v1.Taint{kubeadmconstants.OldControlPlaneTaint}, newTaints: []v1.Taint{kubeadmconstants.ControlPlaneTaint},
expectedPatch: `{"spec":{"taints":[{"effect":"NoSchedule","key":"node-role.kubernetes.io/master"}]}}`, expectedPatch: `{"spec":{"taints":[{"effect":"NoSchedule","key":"node-role.kubernetes.io/control-plane"}]}}`,
}, },
{ {
name: "nothing missing", name: "nothing missing",
@ -81,8 +67,8 @@ func TestMarkControlPlane(t *testing.T) {
kubeadmconstants.LabelNodeRoleControlPlane, kubeadmconstants.LabelNodeRoleControlPlane,
kubeadmconstants.LabelExcludeFromExternalLB, kubeadmconstants.LabelExcludeFromExternalLB,
}, },
existingTaints: []v1.Taint{kubeadmconstants.OldControlPlaneTaint}, existingTaints: []v1.Taint{kubeadmconstants.ControlPlaneTaint},
newTaints: []v1.Taint{kubeadmconstants.OldControlPlaneTaint}, newTaints: []v1.Taint{kubeadmconstants.ControlPlaneTaint},
expectedPatch: `{}`, expectedPatch: `{}`,
}, },
{ {
@ -113,8 +99,8 @@ func TestMarkControlPlane(t *testing.T) {
Effect: v1.TaintEffectNoSchedule, Effect: v1.TaintEffectNoSchedule,
}, },
}, },
newTaints: []v1.Taint{kubeadmconstants.OldControlPlaneTaint}, newTaints: []v1.Taint{kubeadmconstants.ControlPlaneTaint},
expectedPatch: `{"spec":{"taints":[{"effect":"NoSchedule","key":"node-role.kubernetes.io/master"},{"effect":"NoSchedule","key":"node.cloudprovider.kubernetes.io/uninitialized"}]}}`, expectedPatch: `{"spec":{"taints":[{"effect":"NoSchedule","key":"node-role.kubernetes.io/control-plane"},{"effect":"NoSchedule","key":"node.cloudprovider.kubernetes.io/uninitialized"}]}}`,
}, },
} }

6
cmd/kubeadm/app/util/config/cluster_test.go
View File

@ -304,7 +304,7 @@ func TestGetNodeRegistration(t *testing.T) {
}, },
}, },
Spec: v1.NodeSpec{ Spec: v1.NodeSpec{
Taints: []v1.Taint{kubeadmconstants.OldControlPlaneTaint}, Taints: []v1.Taint{kubeadmconstants.ControlPlaneTaint},
}, },
}, },
}, },
@ -559,7 +559,7 @@ func TestGetInitConfigurationFromCluster(t *testing.T) {
}, },
}, },
Spec: v1.NodeSpec{ Spec: v1.NodeSpec{
Taints: []v1.Taint{kubeadmconstants.OldControlPlaneTaint}, Taints: []v1.Taint{kubeadmconstants.ControlPlaneTaint},
}, },
}, },
}, },
@ -636,7 +636,7 @@ func TestGetInitConfigurationFromCluster(t *testing.T) {
}, },
}, },
Spec: v1.NodeSpec{ Spec: v1.NodeSpec{
Taints: []v1.Taint{kubeadmconstants.OldControlPlaneTaint}, Taints: []v1.Taint{kubeadmconstants.ControlPlaneTaint},
}, },
}, },
}, },