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

Merge pull request #42877 from gmarek/taint_cleanup

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 42877, 42853)

Remove unused functions and make logs slightly better

Zero risk cleanup, removing function that are not used anymore, and adding few more logs to help debugging problems.

cc @aveshagarwal
This commit is contained in:
Kubernetes Submit Queue 2017-03-10 09:54:21 -08:00 committed by GitHub
commit e261cabb09
5 changed files with 6 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/controller/node/BUILD
View File

@ -71,7 +71,6 @@ go_test(
library = ":go_default_library",
tags = ["automanaged"],
deps = [
"//pkg/api:go_default_library",
"//pkg/api/v1:go_default_library",
"//pkg/apis/extensions/v1beta1:go_default_library",
"//pkg/client/clientset_generated/clientset:go_default_library",

5
pkg/controller/node/nodecontroller.go
View File

@ -485,6 +485,7 @@ func (nc *NodeController) Run() {
oppositeTaint = *NotReadyTaintTemplate
} else {
// It seems that the Node is ready again, so there's no need to taint it.
glog.V(4).Infof("Node %v was in a taint queue, but it's ready now. Ignoring taint request.", value.Value)
return true, 0
}
@ -498,6 +499,8 @@ func (nc *NodeController) Run() {
value.Value,
err))
return false, 0
} else {
glog.V(4).Info("Added %v Taint to Node %v", taintToAdd, value.Value)
}
err = controller.RemoveTaintOffNode(nc.kubeClient, value.Value, &oppositeTaint, node)
if err != nil {
@ -508,6 +511,8 @@ func (nc *NodeController) Run() {
value.Value,
err))
return false, 0
} else {
glog.V(4).Info("Made sure that Node %v has no %v Taint", value.Value, oppositeTaint)
}
return true, 0
})

35
pkg/controller/node/taint_controller.go
View File

@ -44,41 +44,6 @@ const (
retries = 5
)
func computeTaintDifference(left []v1.Taint, right []v1.Taint) []v1.Taint {
result := []v1.Taint{}
for i := range left {
found := false
for j := range right {
if left[i] == right[j] {
found = true
break
}
}
if !found {
result = append(result, left[i])
}
}
return result
}
// copy of 'computeTaintDifference' - long live lack of generics...
func computeTolerationDifference(left []v1.Toleration, right []v1.Toleration) []v1.Toleration {
result := []v1.Toleration{}
for i := range left {
found := false
for j := range right {
if left[i] == right[j] {
found = true
break
}
}
if !found {
result = append(result, left[i])
}
}
return result
}
// Needed to make workqueue work
type updateItemInterface interface{}

94
pkg/controller/node/taint_controller_test.go
View File

@ -22,7 +22,6 @@ import (
"testing"
"time"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake"
"k8s.io/kubernetes/pkg/controller/node/testutil"
@ -93,99 +92,6 @@ func TestFilterNoExecuteTaints(t *testing.T) {
}
}
func TestComputeTaintDifference(t *testing.T) {
testCases := []struct {
lhs []v1.Taint
rhs []v1.Taint
expectedDifference []v1.Taint
description string
}{
{
lhs: []v1.Taint{
{
Key: "one",
Value: "one",
},
{
Key: "two",
Value: "two",
},
},
rhs: []v1.Taint{
{
Key: "one",
Value: "one",
},
{
Key: "two",
Value: "two",
},
},
description: "Equal sets",
},
{
lhs: []v1.Taint{
{
Key: "one",
Value: "one",
},
},
expectedDifference: []v1.Taint{
{
Key: "one",
Value: "one",
},
},
description: "Right is empty",
},
{
rhs: []v1.Taint{
{
Key: "one",
Value: "one",
},
},
description: "Left is empty",
},
{
lhs: []v1.Taint{
{
Key: "one",
Value: "one",
},
{
Key: "two",
Value: "two",
},
},
rhs: []v1.Taint{
{
Key: "two",
Value: "two",
},
{
Key: "three",
Value: "three",
},
},
expectedDifference: []v1.Taint{
{
Key: "one",
Value: "one",
},
},
description: "Intersecting arrays",
},
}
for _, item := range testCases {
difference := computeTaintDifference(item.lhs, item.rhs)
if !api.Semantic.DeepEqual(difference, item.expectedDifference) {
t.Errorf("%v: difference in not what expected. Got %v, expected %v", item.description, difference, item.expectedDifference)
}
}
}
func TestCreatePod(t *testing.T) {
testCases := []struct {
description string

2
pkg/controller/node/timed_workers.go
View File

@ -121,12 +121,12 @@ func (q *TimedWorkerQueue) AddWork(args *WorkArgs, createdAt time.Time, fireAt t
// CancelWork removes scheduled function execution from the queue. Returns true if work was cancelled.
func (q *TimedWorkerQueue) CancelWork(key string) bool {
glog.V(4).Infof("Cancelling TimedWorkerQueue item %v at %v", key, time.Now())
q.Lock()
defer q.Unlock()
worker, found := q.workers[key]
result := false
if found {
glog.V(4).Infof("Cancelling TimedWorkerQueue item %v at %v", key, time.Now())
if worker != nil {
result = true
worker.Cancel()