
Automatic merge from submit-queue (batch tested with PRs 46239, 46627, 46346, 46388, 46524) move labels to components which own the APIs During the apimachinery split in 1.6, we accidentally moved several label APIs into apimachinery. They don't belong there, since the individual APIs are not general machinery concerns, but instead are the concern of particular components: most commonly the kubelet. This pull moves the labels into their owning components and out of API machinery. @kubernetes/sig-api-machinery-misc @kubernetes/api-reviewers @kubernetes/api-approvers @derekwaynecarr since most of these are related to the kubelet
291 lines
8.7 KiB
Go
291 lines
8.7 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 defaulttolerationseconds
|
|
|
|
import (
|
|
"testing"
|
|
|
|
"k8s.io/apiserver/pkg/admission"
|
|
"k8s.io/kubernetes/pkg/api"
|
|
"k8s.io/kubernetes/pkg/api/helper"
|
|
"k8s.io/kubernetes/plugin/pkg/scheduler/algorithm"
|
|
)
|
|
|
|
func TestForgivenessAdmission(t *testing.T) {
|
|
var defaultTolerationSeconds int64 = 300
|
|
|
|
genTolerationSeconds := func(s int64) *int64 {
|
|
return &s
|
|
}
|
|
|
|
handler := NewDefaultTolerationSeconds()
|
|
tests := []struct {
|
|
description string
|
|
requestedPod api.Pod
|
|
expectedPod api.Pod
|
|
}{
|
|
{
|
|
description: "pod has no tolerations, expect add tolerations for `notReady:NoExecute` and `unreachable:NoExecute`",
|
|
requestedPod: api.Pod{
|
|
Spec: api.PodSpec{},
|
|
},
|
|
expectedPod: api.Pod{
|
|
Spec: api.PodSpec{
|
|
Tolerations: []api.Toleration{
|
|
{
|
|
Key: algorithm.TaintNodeNotReady,
|
|
Operator: api.TolerationOpExists,
|
|
Effect: api.TaintEffectNoExecute,
|
|
TolerationSeconds: &defaultTolerationSeconds,
|
|
},
|
|
{
|
|
Key: algorithm.TaintNodeUnreachable,
|
|
Operator: api.TolerationOpExists,
|
|
Effect: api.TaintEffectNoExecute,
|
|
TolerationSeconds: &defaultTolerationSeconds,
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
description: "pod has tolerations, but none is for taint `notReady:NoExecute` or `unreachable:NoExecute`, expect add tolerations for `notReady:NoExecute` and `unreachable:NoExecute`",
|
|
requestedPod: api.Pod{
|
|
Spec: api.PodSpec{
|
|
Tolerations: []api.Toleration{
|
|
{
|
|
Key: "foo",
|
|
Operator: api.TolerationOpEqual,
|
|
Value: "bar",
|
|
Effect: api.TaintEffectNoSchedule,
|
|
TolerationSeconds: genTolerationSeconds(700),
|
|
},
|
|
},
|
|
},
|
|
},
|
|
expectedPod: api.Pod{
|
|
Spec: api.PodSpec{
|
|
Tolerations: []api.Toleration{
|
|
{
|
|
Key: "foo",
|
|
Operator: api.TolerationOpEqual,
|
|
Value: "bar",
|
|
Effect: api.TaintEffectNoSchedule,
|
|
TolerationSeconds: genTolerationSeconds(700),
|
|
},
|
|
{
|
|
Key: algorithm.TaintNodeNotReady,
|
|
Operator: api.TolerationOpExists,
|
|
Effect: api.TaintEffectNoExecute,
|
|
TolerationSeconds: &defaultTolerationSeconds,
|
|
},
|
|
{
|
|
Key: algorithm.TaintNodeUnreachable,
|
|
Operator: api.TolerationOpExists,
|
|
Effect: api.TaintEffectNoExecute,
|
|
TolerationSeconds: &defaultTolerationSeconds,
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
description: "pod specified a toleration for taint `notReady:NoExecute`, expect add toleration for `unreachable:NoExecute`",
|
|
requestedPod: api.Pod{
|
|
Spec: api.PodSpec{
|
|
Tolerations: []api.Toleration{
|
|
{
|
|
Key: algorithm.TaintNodeNotReady,
|
|
Operator: api.TolerationOpExists,
|
|
Effect: api.TaintEffectNoExecute,
|
|
TolerationSeconds: genTolerationSeconds(700),
|
|
},
|
|
},
|
|
},
|
|
},
|
|
expectedPod: api.Pod{
|
|
Spec: api.PodSpec{
|
|
Tolerations: []api.Toleration{
|
|
{
|
|
Key: algorithm.TaintNodeNotReady,
|
|
Operator: api.TolerationOpExists,
|
|
Effect: api.TaintEffectNoExecute,
|
|
TolerationSeconds: genTolerationSeconds(700),
|
|
},
|
|
{
|
|
Key: algorithm.TaintNodeUnreachable,
|
|
Operator: api.TolerationOpExists,
|
|
Effect: api.TaintEffectNoExecute,
|
|
TolerationSeconds: &defaultTolerationSeconds,
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
description: "pod specified a toleration for taint `unreachable:NoExecute`, expect add toleration for `notReady:NoExecute`",
|
|
requestedPod: api.Pod{
|
|
Spec: api.PodSpec{
|
|
Tolerations: []api.Toleration{
|
|
{
|
|
Key: algorithm.TaintNodeUnreachable,
|
|
Operator: api.TolerationOpExists,
|
|
Effect: api.TaintEffectNoExecute,
|
|
TolerationSeconds: genTolerationSeconds(700),
|
|
},
|
|
},
|
|
},
|
|
},
|
|
expectedPod: api.Pod{
|
|
Spec: api.PodSpec{
|
|
Tolerations: []api.Toleration{
|
|
{
|
|
Key: algorithm.TaintNodeUnreachable,
|
|
Operator: api.TolerationOpExists,
|
|
Effect: api.TaintEffectNoExecute,
|
|
TolerationSeconds: genTolerationSeconds(700),
|
|
},
|
|
{
|
|
Key: algorithm.TaintNodeNotReady,
|
|
Operator: api.TolerationOpExists,
|
|
Effect: api.TaintEffectNoExecute,
|
|
TolerationSeconds: &defaultTolerationSeconds,
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
description: "pod specified tolerations for both `notReady:NoExecute` and `unreachable:NoExecute`, expect no change",
|
|
requestedPod: api.Pod{
|
|
Spec: api.PodSpec{
|
|
Tolerations: []api.Toleration{
|
|
{
|
|
Key: algorithm.TaintNodeNotReady,
|
|
Operator: api.TolerationOpExists,
|
|
Effect: api.TaintEffectNoExecute,
|
|
TolerationSeconds: genTolerationSeconds(700),
|
|
},
|
|
{
|
|
Key: algorithm.TaintNodeUnreachable,
|
|
Operator: api.TolerationOpExists,
|
|
Effect: api.TaintEffectNoExecute,
|
|
TolerationSeconds: genTolerationSeconds(700),
|
|
},
|
|
},
|
|
},
|
|
},
|
|
expectedPod: api.Pod{
|
|
Spec: api.PodSpec{
|
|
Tolerations: []api.Toleration{
|
|
{
|
|
Key: algorithm.TaintNodeNotReady,
|
|
Operator: api.TolerationOpExists,
|
|
Effect: api.TaintEffectNoExecute,
|
|
TolerationSeconds: genTolerationSeconds(700),
|
|
},
|
|
{
|
|
Key: algorithm.TaintNodeUnreachable,
|
|
Operator: api.TolerationOpExists,
|
|
Effect: api.TaintEffectNoExecute,
|
|
TolerationSeconds: genTolerationSeconds(700),
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
description: "pod specified toleration for taint `unreachable`, expect add toleration for `notReady:NoExecute`",
|
|
requestedPod: api.Pod{
|
|
Spec: api.PodSpec{
|
|
Tolerations: []api.Toleration{
|
|
{
|
|
Key: algorithm.TaintNodeUnreachable,
|
|
Operator: api.TolerationOpExists,
|
|
TolerationSeconds: genTolerationSeconds(700),
|
|
},
|
|
},
|
|
},
|
|
},
|
|
expectedPod: api.Pod{
|
|
Spec: api.PodSpec{
|
|
Tolerations: []api.Toleration{
|
|
{
|
|
Key: algorithm.TaintNodeUnreachable,
|
|
Operator: api.TolerationOpExists,
|
|
TolerationSeconds: genTolerationSeconds(700),
|
|
},
|
|
{
|
|
Key: algorithm.TaintNodeNotReady,
|
|
Operator: api.TolerationOpExists,
|
|
Effect: api.TaintEffectNoExecute,
|
|
TolerationSeconds: genTolerationSeconds(300),
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
description: "pod has wildcard toleration for all kind of taints, expect no change",
|
|
requestedPod: api.Pod{
|
|
Spec: api.PodSpec{
|
|
Tolerations: []api.Toleration{
|
|
{Operator: api.TolerationOpExists, TolerationSeconds: genTolerationSeconds(700)},
|
|
},
|
|
},
|
|
},
|
|
expectedPod: api.Pod{
|
|
Spec: api.PodSpec{
|
|
Tolerations: []api.Toleration{
|
|
{
|
|
Operator: api.TolerationOpExists,
|
|
TolerationSeconds: genTolerationSeconds(700),
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
}
|
|
|
|
for _, test := range tests {
|
|
err := handler.Admit(admission.NewAttributesRecord(&test.requestedPod, nil, api.Kind("Pod").WithVersion("version"), "foo", "name", api.Resource("pods").WithVersion("version"), "", "ignored", nil))
|
|
if err != nil {
|
|
t.Errorf("[%s]: unexpected error %v for pod %+v", test.description, err, test.requestedPod)
|
|
}
|
|
|
|
if !helper.Semantic.DeepEqual(test.expectedPod.Annotations, test.requestedPod.Annotations) {
|
|
t.Errorf("[%s]: expected %#v got %#v", test.description, test.expectedPod.Annotations, test.requestedPod.Annotations)
|
|
}
|
|
}
|
|
}
|
|
|
|
func TestHandles(t *testing.T) {
|
|
handler := NewDefaultTolerationSeconds()
|
|
tests := map[admission.Operation]bool{
|
|
admission.Update: true,
|
|
admission.Create: true,
|
|
admission.Delete: false,
|
|
admission.Connect: false,
|
|
}
|
|
for op, expected := range tests {
|
|
result := handler.Handles(op)
|
|
if result != expected {
|
|
t.Errorf("Unexpected result for operation %s: %v\n", op, result)
|
|
}
|
|
}
|
|
}
|