github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #68659 from seans3/drain-test-fix 

Replace internal version of resource in drain test with external version
pull/58/head
k8s-ci-robot 2018-09-25 18:12:54 -07:00 committed by GitHub
parent d1e24acee7 446fbd51e3
commit 1f08d955cd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/kubectl/cmd/BUILD
View File

@ -192,7 +192,6 @@ go_test(
"//pkg/api/legacyscheme:go_default_library",
"//pkg/api/testapi:go_default_library",
"//pkg/api/testing:go_default_library",
"//pkg/apis/batch:go_default_library",
"//pkg/apis/core:go_default_library",
"//pkg/apis/extensions:go_default_library",
"//pkg/kubectl/cmd/create:go_default_library",
@ -204,7 +203,9 @@ go_test(
"//pkg/kubectl/util/i18n:go_default_library",
"//pkg/kubectl/util/term:go_default_library",
"//pkg/printers:go_default_library",
"//staging/src/k8s.io/api/batch/v1:go_default_library",
"//staging/src/k8s.io/api/core/v1:go_default_library",
"//staging/src/k8s.io/api/extensions/v1beta1:go_default_library",
"//staging/src/k8s.io/api/policy/v1beta1:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/api/meta:go_default_library",

57
pkg/kubectl/cmd/drain_test.go
View File

@ -33,7 +33,9 @@ import (
"github.com/spf13/cobra"
"k8s.io/cli-runtime/pkg/genericclioptions"
batchv1 "k8s.io/api/batch/v1"
corev1 "k8s.io/api/core/v1"
extensionsv1beta1 "k8s.io/api/extensions/v1beta1"
policyv1beta1 "k8s.io/api/policy/v1beta1"
apierrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@ -45,9 +47,6 @@ import (
"k8s.io/cli-runtime/pkg/genericclioptions/printers"
"k8s.io/client-go/rest/fake"
"k8s.io/kubernetes/pkg/api/testapi"
"k8s.io/kubernetes/pkg/apis/batch"
api "k8s.io/kubernetes/pkg/apis/core"
"k8s.io/kubernetes/pkg/apis/extensions"
cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing"
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
"k8s.io/kubernetes/pkg/kubectl/scheme"
@ -238,7 +237,7 @@ func TestDrain(t *testing.T) {
labels := make(map[string]string)
labels["my_key"] = "my_value"
rc := api.ReplicationController{
rc := corev1.ReplicationController{
ObjectMeta: metav1.ObjectMeta{
Name: "rc",
Namespace: "default",
@ -246,7 +245,7 @@ func TestDrain(t *testing.T) {
Labels: labels,
SelfLink: testapi.Default.SelfLink("replicationcontrollers", "rc"),
},
Spec: api.ReplicationControllerSpec{
Spec: corev1.ReplicationControllerSpec{
Selector: labels,
},
}
@ -274,14 +273,14 @@ func TestDrain(t *testing.T) {
},
}
ds := extensions.DaemonSet{
ds := extensionsv1beta1.DaemonSet{
ObjectMeta: metav1.ObjectMeta{
Name: "ds",
Namespace: "default",
CreationTimestamp: metav1.Time{Time: time.Now()},
SelfLink: testapi.Default.SelfLink("daemonsets", "ds"),
},
Spec: extensions.DaemonSetSpec{
Spec: extensionsv1beta1.DaemonSetSpec{
Selector: &metav1.LabelSelector{MatchLabels: labels},
},
}
@ -374,14 +373,14 @@ func TestDrain(t *testing.T) {
},
}
job := batch.Job{
job := batchv1.Job{
ObjectMeta: metav1.ObjectMeta{
Name: "job",
Namespace: "default",
CreationTimestamp: metav1.Time{Time: time.Now()},
SelfLink: testapi.Default.SelfLink("jobs", "job"),
},
Spec: batch.JobSpec{
Spec: batchv1.JobSpec{
Selector: &metav1.LabelSelector{MatchLabels: labels},
},
}
@ -445,7 +444,7 @@ func TestDrain(t *testing.T) {
},
}
rs := extensions.ReplicaSet{
rs := extensionsv1beta1.ReplicaSet{
ObjectMeta: metav1.ObjectMeta{
Name: "rs",
Namespace: "default",
@ -453,7 +452,7 @@ func TestDrain(t *testing.T) {
Labels: labels,
SelfLink: testapi.Default.SelfLink("replicasets", "rs"),
},
Spec: extensions.ReplicaSetSpec{
Spec: extensionsv1beta1.ReplicaSetSpec{
Selector: &metav1.LabelSelector{MatchLabels: labels},
},
}
@ -535,8 +534,8 @@ func TestDrain(t *testing.T) {
node *corev1.Node
expected *corev1.Node
pods []corev1.Pod
rcs []api.ReplicationController
replicaSets []extensions.ReplicaSet
rcs []corev1.ReplicationController
replicaSets []extensionsv1beta1.ReplicaSet
args []string
expectWarning string
expectFatal bool
@ -547,7 +546,7 @@ func TestDrain(t *testing.T) {
node: node,
expected: cordoned_node,
pods: []corev1.Pod{rc_pod},
rcs: []api.ReplicationController{rc},
rcs: []corev1.ReplicationController{rc},
args: []string{"node"},
expectFatal: false,
expectDelete: true,
@ -557,7 +556,7 @@ func TestDrain(t *testing.T) {
node: node,
expected: cordoned_node,
pods: []corev1.Pod{ds_pod},
rcs: []api.ReplicationController{rc},
rcs: []corev1.ReplicationController{rc},
args: []string{"node"},
expectFatal: true,
expectDelete: false,
@ -567,7 +566,7 @@ func TestDrain(t *testing.T) {
node: node,
expected: cordoned_node,
pods: []corev1.Pod{ds_terminated_pod},
rcs: []api.ReplicationController{rc},
rcs: []corev1.ReplicationController{rc},
args: []string{"node"},
expectFatal: false,
expectDelete: true,
@ -577,7 +576,7 @@ func TestDrain(t *testing.T) {
node: node,
expected: cordoned_node,
pods: []corev1.Pod{orphaned_ds_pod},
rcs: []api.ReplicationController{},
rcs: []corev1.ReplicationController{},
args: []string{"node"},
expectFatal: true,
expectDelete: false,
@ -587,7 +586,7 @@ func TestDrain(t *testing.T) {
node: node,
expected: cordoned_node,
pods: []corev1.Pod{orphaned_ds_pod},
rcs: []api.ReplicationController{},
rcs: []corev1.ReplicationController{},
args: []string{"node", "--force"},
expectFatal: false,
expectDelete: true,
@ -597,7 +596,7 @@ func TestDrain(t *testing.T) {
node: node,
expected: cordoned_node,
pods: []corev1.Pod{ds_pod},
rcs: []api.ReplicationController{rc},
rcs: []corev1.ReplicationController{rc},
args: []string{"node", "--ignore-daemonsets"},
expectFatal: false,
expectDelete: false,
@ -607,7 +606,7 @@ func TestDrain(t *testing.T) {
node: node,
expected: cordoned_node,
pods: []corev1.Pod{ds_pod_with_emptyDir},
rcs: []api.ReplicationController{rc},
rcs: []corev1.ReplicationController{rc},
args: []string{"node", "--ignore-daemonsets"},
expectWarning: "WARNING: Ignoring DaemonSet-managed pods: bar\n",
expectFatal: false,
@ -618,7 +617,7 @@ func TestDrain(t *testing.T) {
node: node,
expected: cordoned_node,
pods: []corev1.Pod{job_pod},
rcs: []api.ReplicationController{rc},
rcs: []corev1.ReplicationController{rc},
args: []string{"node", "--force", "--delete-local-data=true"},
expectFatal: false,
expectDelete: true,
@ -628,7 +627,7 @@ func TestDrain(t *testing.T) {
node: node,
expected: cordoned_node,
pods: []corev1.Pod{terminated_job_pod_with_local_storage},
rcs: []api.ReplicationController{rc},
rcs: []corev1.ReplicationController{rc},
args: []string{"node"},
expectFatal: false,
expectDelete: true,
@ -638,7 +637,7 @@ func TestDrain(t *testing.T) {
node: node,
expected: cordoned_node,
pods: []corev1.Pod{rs_pod},
replicaSets: []extensions.ReplicaSet{rs},
replicaSets: []extensionsv1beta1.ReplicaSet{rs},
args: []string{"node"},
expectFatal: false,
expectDelete: true,
@ -648,7 +647,7 @@ func TestDrain(t *testing.T) {
node: node,
expected: cordoned_node,
pods: []corev1.Pod{naked_pod},
rcs: []api.ReplicationController{},
rcs: []corev1.ReplicationController{},
args: []string{"node"},
expectFatal: true,
expectDelete: false,
@ -658,7 +657,7 @@ func TestDrain(t *testing.T) {
node: node,
expected: cordoned_node,
pods: []corev1.Pod{naked_pod},
rcs: []api.ReplicationController{},
rcs: []corev1.ReplicationController{},
args: []string{"node", "--force"},
expectFatal: false,
expectDelete: true,
@ -677,7 +676,7 @@ func TestDrain(t *testing.T) {
node: node,
expected: cordoned_node,
pods: []corev1.Pod{emptydir_terminated_pod},
rcs: []api.ReplicationController{rc},
rcs: []corev1.ReplicationController{rc},
args: []string{"node"},
expectFatal: false,
expectDelete: true,
@ -696,7 +695,7 @@ func TestDrain(t *testing.T) {
node: node,
expected: cordoned_node,
pods: []corev1.Pod{},
rcs: []api.ReplicationController{rc},
rcs: []corev1.ReplicationController{rc},
args: []string{"node"},
expectFatal: false,
expectDelete: false,
@ -766,7 +765,7 @@ func TestDrain(t *testing.T) {
case m.isFor("GET", "/namespaces/default/daemonsets/ds"):
return &http.Response{StatusCode: 200, Header: defaultHeader(), Body: objBody(testapi.Extensions.Codec(), &ds)}, nil
case m.isFor("GET", "/namespaces/default/daemonsets/missing-ds"):
return &http.Response{StatusCode: 404, Header: defaultHeader(), Body: objBody(testapi.Extensions.Codec(), &extensions.DaemonSet{})}, nil
return &http.Response{StatusCode: 404, Header: defaultHeader(), Body: objBody(testapi.Extensions.Codec(), &extensionsv1beta1.DaemonSet{})}, nil
case m.isFor("GET", "/namespaces/default/jobs/job"):
return &http.Response{StatusCode: 200, Header: defaultHeader(), Body: objBody(testapi.Batch.Codec(), &job)}, nil
case m.isFor("GET", "/namespaces/default/replicasets/rs"):
@ -785,7 +784,7 @@ func TestDrain(t *testing.T) {
}
return &http.Response{StatusCode: 200, Header: defaultHeader(), Body: objBody(codec, &corev1.PodList{Items: test.pods})}, nil
case m.isFor("GET", "/replicationcontrollers"):
return &http.Response{StatusCode: 200, Header: defaultHeader(), Body: objBody(codec, &api.ReplicationControllerList{Items: test.rcs})}, nil
return &http.Response{StatusCode: 200, Header: defaultHeader(), Body: objBody(codec, &corev1.ReplicationControllerList{Items: test.rcs})}, nil
case m.isFor("PATCH", "/nodes/node"):
data, err := ioutil.ReadAll(req.Body)
if err != nil {