mirror of
https://github.com/optim-enterprises-bv/kubernetes.git
synced 2025-12-04 07:05:37 +00:00
- Mark the "node-role.kubernetes.io/master" key for labels
and taints as deprecated.
- During "kubeadm init/join" apply the label
"node-role.kubernetes.io/control-plane" to new control-plane nodes,
next to the existing "node-role.kubernetes.io/master" label.
- During "kubeadm upgrade apply", find all Nodes with the "master"
label and also apply the "control-plane" label to them
(if they don't have it).
- During upgrade health-checks collect Nodes labeled both "master"
and "control-plane".
- Rename the constants.ControlPlane{Taint|Toleraton} to
constants.OldControlPlane{Taint|Toleraton} to manage the transition.
- Mark constants.OldControlPlane{{Taint|Toleraton} as deprecated.
- Use constants.OldControlPlane{{Taint|Toleraton} instead of
constants.ControlPlane{Taint|Toleraton} everywhere.
- Introduce constants.ControlPlane{Taint|Toleraton}.
- Add constants.ControlPlaneToleraton to the kube-dns / CoreDNS
Deployments to make them anticipate the introduction
of the "node-role.kubernetes.io/control-plane:NoSchedule"
taint (constants.ControlPlaneTaint) on kubeadm control-plane Nodes.
186 lines
5.8 KiB
Go
186 lines
5.8 KiB
Go
/*
|
|
Copyright 2017 The Kubernetes Authors.
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/
|
|
|
|
package markcontrolplane
|
|
|
|
import (
|
|
"bytes"
|
|
"encoding/json"
|
|
"net/http"
|
|
"net/http/httptest"
|
|
"testing"
|
|
|
|
v1 "k8s.io/api/core/v1"
|
|
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
|
clientset "k8s.io/client-go/kubernetes"
|
|
restclient "k8s.io/client-go/rest"
|
|
kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants"
|
|
)
|
|
|
|
func TestMarkControlPlane(t *testing.T) {
|
|
// Note: this test takes advantage of the deterministic marshalling of
|
|
// JSON provided by strategicpatch so that "expectedPatch" can use a
|
|
// string equality test instead of a logical JSON equality test. That
|
|
// will need to change if strategicpatch's behavior changes in the
|
|
// future.
|
|
tests := []struct {
|
|
name string
|
|
existingLabels []string
|
|
existingTaints []v1.Taint
|
|
newTaints []v1.Taint
|
|
expectedPatch string
|
|
}{
|
|
{
|
|
name: "control-plane label and taint missing",
|
|
existingLabels: []string{""},
|
|
existingTaints: nil,
|
|
newTaints: []v1.Taint{kubeadmconstants.OldControlPlaneTaint},
|
|
expectedPatch: `{"metadata":{"labels":{"node-role.kubernetes.io/control-plane":"","node-role.kubernetes.io/master":""}},"spec":{"taints":[{"effect":"NoSchedule","key":"node-role.kubernetes.io/master"}]}}`,
|
|
},
|
|
{
|
|
name: "control-plane label and taint missing but taint not wanted",
|
|
existingLabels: []string{""},
|
|
existingTaints: nil,
|
|
newTaints: nil,
|
|
expectedPatch: `{"metadata":{"labels":{"node-role.kubernetes.io/control-plane":"","node-role.kubernetes.io/master":""}}}`,
|
|
},
|
|
{
|
|
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-role.kubernetes.io/master":""}}}`,
|
|
},
|
|
{
|
|
name: "control-plane taint missing",
|
|
existingLabels: []string{
|
|
kubeadmconstants.LabelNodeRoleOldControlPlane,
|
|
kubeadmconstants.LabelNodeRoleControlPlane,
|
|
},
|
|
existingTaints: nil,
|
|
newTaints: []v1.Taint{kubeadmconstants.OldControlPlaneTaint},
|
|
expectedPatch: `{"spec":{"taints":[{"effect":"NoSchedule","key":"node-role.kubernetes.io/master"}]}}`,
|
|
},
|
|
{
|
|
name: "nothing missing",
|
|
existingLabels: []string{
|
|
kubeadmconstants.LabelNodeRoleOldControlPlane,
|
|
kubeadmconstants.LabelNodeRoleControlPlane,
|
|
},
|
|
existingTaints: []v1.Taint{kubeadmconstants.OldControlPlaneTaint},
|
|
newTaints: []v1.Taint{kubeadmconstants.OldControlPlaneTaint},
|
|
expectedPatch: `{}`,
|
|
},
|
|
{
|
|
name: "has taint and no new taints wanted",
|
|
existingLabels: []string{
|
|
kubeadmconstants.LabelNodeRoleOldControlPlane,
|
|
kubeadmconstants.LabelNodeRoleControlPlane,
|
|
},
|
|
existingTaints: []v1.Taint{
|
|
{
|
|
Key: "node.cloudprovider.kubernetes.io/uninitialized",
|
|
Effect: v1.TaintEffectNoSchedule,
|
|
},
|
|
},
|
|
newTaints: nil,
|
|
expectedPatch: `{}`,
|
|
},
|
|
{
|
|
name: "has taint and should merge with wanted taint",
|
|
existingLabels: []string{
|
|
kubeadmconstants.LabelNodeRoleOldControlPlane,
|
|
kubeadmconstants.LabelNodeRoleControlPlane,
|
|
},
|
|
existingTaints: []v1.Taint{
|
|
{
|
|
Key: "node.cloudprovider.kubernetes.io/uninitialized",
|
|
Effect: v1.TaintEffectNoSchedule,
|
|
},
|
|
},
|
|
newTaints: []v1.Taint{kubeadmconstants.OldControlPlaneTaint},
|
|
expectedPatch: `{"spec":{"taints":[{"effect":"NoSchedule","key":"node-role.kubernetes.io/master"},{"effect":"NoSchedule","key":"node.cloudprovider.kubernetes.io/uninitialized"}]}}`,
|
|
},
|
|
}
|
|
|
|
for _, tc := range tests {
|
|
t.Run(tc.name, func(t *testing.T) {
|
|
nodename := "node01"
|
|
controlPlaneNode := &v1.Node{
|
|
ObjectMeta: metav1.ObjectMeta{
|
|
Name: nodename,
|
|
Labels: map[string]string{
|
|
v1.LabelHostname: nodename,
|
|
},
|
|
},
|
|
}
|
|
|
|
for _, label := range tc.existingLabels {
|
|
controlPlaneNode.ObjectMeta.Labels[label] = ""
|
|
}
|
|
|
|
if tc.existingTaints != nil {
|
|
controlPlaneNode.Spec.Taints = tc.existingTaints
|
|
}
|
|
|
|
jsonNode, err := json.Marshal(controlPlaneNode)
|
|
if err != nil {
|
|
t.Fatalf("unexpected encoding error: %v", err)
|
|
}
|
|
|
|
var patchRequest string
|
|
s := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
|
|
w.Header().Set("Content-Type", "application/json")
|
|
|
|
if req.URL.Path != "/api/v1/nodes/"+nodename {
|
|
t.Errorf("request for unexpected HTTP resource: %v", req.URL.Path)
|
|
http.Error(w, "", http.StatusNotFound)
|
|
return
|
|
}
|
|
|
|
switch req.Method {
|
|
case "GET":
|
|
case "PATCH":
|
|
buf := new(bytes.Buffer)
|
|
buf.ReadFrom(req.Body)
|
|
patchRequest = buf.String()
|
|
default:
|
|
t.Errorf("request for unexpected HTTP verb: %v", req.Method)
|
|
http.Error(w, "", http.StatusNotFound)
|
|
return
|
|
}
|
|
|
|
w.WriteHeader(http.StatusOK)
|
|
w.Write(jsonNode)
|
|
}))
|
|
defer s.Close()
|
|
|
|
cs, err := clientset.NewForConfig(&restclient.Config{Host: s.URL})
|
|
if err != nil {
|
|
t.Fatalf("unexpected error building clientset: %v", err)
|
|
}
|
|
|
|
if err := MarkControlPlane(cs, nodename, tc.newTaints); err != nil {
|
|
t.Errorf("unexpected error: %v", err)
|
|
}
|
|
|
|
if tc.expectedPatch != patchRequest {
|
|
t.Errorf("unexpected error: wanted patch %v, got %v", tc.expectedPatch, patchRequest)
|
|
}
|
|
})
|
|
}
|
|
}
|