mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-11-02 23:02:25 +00:00
Although tainting the master is normally a good and proper thing to do in some
situations (docker for mac in our case, but I suppose minikube and such as
well) having a single host configuration is desirable.
In linuxkit we have a [workaround](443e47c408/projects/kubernetes/kubernetes/kubeadm-init.sh (L19...L22))
to remove the taint after initialisation. With the change here we could simply
populate /etc/kubeadm/kubeadm.yaml` with `noTaintMaster: true` instead and have
it never be tainted in the first place.
I have only added this to the config file and not to the CLI since AIUI the
latter is somewhat deprecated.
The code also arranges to _remove_ an existing taint if it is unwanted. I'm
unsure if this behaviour is correct or desirable, I think a reasonable argument
could be made for leaving an existing taint in place too.
Signed-off-by: Ian Campbell <ijc@docker.com>
163 lines
4.3 KiB
Go
163 lines
4.3 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 markmaster
|
|
|
|
import (
|
|
"bytes"
|
|
"encoding/json"
|
|
"io"
|
|
"net/http"
|
|
"net/http/httptest"
|
|
"testing"
|
|
|
|
"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"
|
|
kubeletapis "k8s.io/kubernetes/pkg/kubelet/apis"
|
|
"k8s.io/kubernetes/pkg/util/node"
|
|
)
|
|
|
|
func TestMarkMaster(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
|
|
existingLabel string
|
|
existingTaint *v1.Taint
|
|
wantTaint bool
|
|
expectedPatch string
|
|
}{
|
|
{
|
|
"master label and taint missing",
|
|
"",
|
|
nil,
|
|
true,
|
|
"{\"metadata\":{\"labels\":{\"node-role.kubernetes.io/master\":\"\"}},\"spec\":{\"taints\":[{\"effect\":\"NoSchedule\",\"key\":\"node-role.kubernetes.io/master\"}]}}",
|
|
},
|
|
{
|
|
"master label and taint missing but taint not wanted",
|
|
"",
|
|
nil,
|
|
false,
|
|
"{\"metadata\":{\"labels\":{\"node-role.kubernetes.io/master\":\"\"}}}",
|
|
},
|
|
{
|
|
"master label missing",
|
|
"",
|
|
&kubeadmconstants.MasterTaint,
|
|
true,
|
|
"{\"metadata\":{\"labels\":{\"node-role.kubernetes.io/master\":\"\"}}}",
|
|
},
|
|
{
|
|
"master taint missing",
|
|
kubeadmconstants.LabelNodeRoleMaster,
|
|
nil,
|
|
true,
|
|
"{\"spec\":{\"taints\":[{\"effect\":\"NoSchedule\",\"key\":\"node-role.kubernetes.io/master\"}]}}",
|
|
},
|
|
{
|
|
"nothing missing",
|
|
kubeadmconstants.LabelNodeRoleMaster,
|
|
&kubeadmconstants.MasterTaint,
|
|
true,
|
|
"{}",
|
|
},
|
|
{
|
|
"nothing missing but taint unwanted",
|
|
kubeadmconstants.LabelNodeRoleMaster,
|
|
&kubeadmconstants.MasterTaint,
|
|
false,
|
|
"{\"spec\":{\"taints\":null}}",
|
|
},
|
|
}
|
|
|
|
for _, tc := range tests {
|
|
hostname := node.GetHostname("")
|
|
masterNode := &v1.Node{
|
|
ObjectMeta: metav1.ObjectMeta{
|
|
Name: hostname,
|
|
Labels: map[string]string{
|
|
kubeletapis.LabelHostname: hostname,
|
|
},
|
|
},
|
|
}
|
|
|
|
if tc.existingLabel != "" {
|
|
masterNode.ObjectMeta.Labels[tc.existingLabel] = ""
|
|
}
|
|
|
|
if tc.existingTaint != nil {
|
|
masterNode.Spec.Taints = append(masterNode.Spec.Taints, *tc.existingTaint)
|
|
}
|
|
|
|
jsonNode, err := json.Marshal(masterNode)
|
|
if err != nil {
|
|
t.Fatalf("MarkMaster(%s): unexpected encoding error: %v", tc.name, 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/"+hostname {
|
|
t.Errorf("MarkMaster(%s): request for unexpected HTTP resource: %v", tc.name, req.URL.Path)
|
|
w.WriteHeader(http.StatusNotFound)
|
|
return
|
|
}
|
|
|
|
switch req.Method {
|
|
case "GET":
|
|
case "PATCH":
|
|
patchRequest = toString(req.Body)
|
|
default:
|
|
t.Errorf("MarkMaster(%s): request for unexpected HTTP verb: %v", tc.name, req.Method)
|
|
w.WriteHeader(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("MarkMaster(%s): unexpected error building clientset: %v", tc.name, err)
|
|
}
|
|
|
|
err = MarkMaster(cs, hostname, tc.wantTaint)
|
|
if err != nil {
|
|
t.Errorf("MarkMaster(%s) returned unexpected error: %v", tc.name, err)
|
|
}
|
|
|
|
if tc.expectedPatch != patchRequest {
|
|
t.Errorf("MarkMaster(%s) wanted patch %v, got %v", tc.name, tc.expectedPatch, patchRequest)
|
|
}
|
|
}
|
|
}
|
|
|
|
func toString(r io.Reader) string {
|
|
buf := new(bytes.Buffer)
|
|
buf.ReadFrom(r)
|
|
return buf.String()
|
|
}
|