From 219246eaad1d9c5da0555f760f5cfc1529d691c8 Mon Sep 17 00:00:00 2001 From: Sean Sullivan Date: Thu, 13 Sep 2018 22:07:44 -0700 Subject: [PATCH 1/2] Replace internal version of resource in drain test with external version --- pkg/kubectl/cmd/BUILD | 3 ++- pkg/kubectl/cmd/drain_test.go | 39 +++++++++++++++++------------------ 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/pkg/kubectl/cmd/BUILD b/pkg/kubectl/cmd/BUILD index 885485458d..715af02ac6 100644 --- a/pkg/kubectl/cmd/BUILD +++ b/pkg/kubectl/cmd/BUILD @@ -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", diff --git a/pkg/kubectl/cmd/drain_test.go b/pkg/kubectl/cmd/drain_test.go index b8862715cf..6d84f9eb8c 100644 --- a/pkg/kubectl/cmd/drain_test.go +++ b/pkg/kubectl/cmd/drain_test.go @@ -33,7 +33,9 @@ import ( "github.com/spf13/cobra" "k8s.io/cli-runtime/pkg/genericclioptions" + batch "k8s.io/api/batch/v1" corev1 "k8s.io/api/core/v1" + extensions "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, }, } @@ -535,7 +534,7 @@ func TestDrain(t *testing.T) { node *corev1.Node expected *corev1.Node pods []corev1.Pod - rcs []api.ReplicationController + rcs []corev1.ReplicationController replicaSets []extensions.ReplicaSet args []string expectWarning string @@ -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, @@ -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, @@ -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 { From 446fbd51e33444f52723839c17b977920006d8f3 Mon Sep 17 00:00:00 2001 From: Sean Sullivan Date: Mon, 24 Sep 2018 11:39:33 -0700 Subject: [PATCH 2/2] More specific import aliases --- pkg/kubectl/cmd/drain_test.go | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pkg/kubectl/cmd/drain_test.go b/pkg/kubectl/cmd/drain_test.go index 6d84f9eb8c..2fa2e546b5 100644 --- a/pkg/kubectl/cmd/drain_test.go +++ b/pkg/kubectl/cmd/drain_test.go @@ -33,9 +33,9 @@ import ( "github.com/spf13/cobra" "k8s.io/cli-runtime/pkg/genericclioptions" - batch "k8s.io/api/batch/v1" + batchv1 "k8s.io/api/batch/v1" corev1 "k8s.io/api/core/v1" - extensions "k8s.io/api/extensions/v1beta1" + 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" @@ -273,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}, }, } @@ -373,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}, }, } @@ -444,7 +444,7 @@ func TestDrain(t *testing.T) { }, } - rs := extensions.ReplicaSet{ + rs := extensionsv1beta1.ReplicaSet{ ObjectMeta: metav1.ObjectMeta{ Name: "rs", Namespace: "default", @@ -452,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,7 +535,7 @@ func TestDrain(t *testing.T) { expected *corev1.Node pods []corev1.Pod rcs []corev1.ReplicationController - replicaSets []extensions.ReplicaSet + replicaSets []extensionsv1beta1.ReplicaSet args []string expectWarning string expectFatal bool @@ -637,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, @@ -765,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"):