From 39a4730db64339934fc6fe0634563693562a466b Mon Sep 17 00:00:00 2001 From: Chao Wang Date: Thu, 15 Mar 2018 14:15:23 +0800 Subject: [PATCH] remove duplicated import --- cmd/kube-apiserver/app/options/options_test.go | 3 +-- pkg/apis/storage/fuzzer/fuzzer.go | 3 +-- pkg/kubelet/config/common_test.go | 7 +++---- test/e2e/apps/daemon_set.go | 7 +++---- test/e2e/storage/vsphere/vsphere_utils.go | 5 ++--- test/integration/auth/svcaccttoken_test.go | 3 +-- 6 files changed, 11 insertions(+), 17 deletions(-) diff --git a/cmd/kube-apiserver/app/options/options_test.go b/cmd/kube-apiserver/app/options/options_test.go index 4e0ca207b1c..ebaededb83e 100644 --- a/cmd/kube-apiserver/app/options/options_test.go +++ b/cmd/kube-apiserver/app/options/options_test.go @@ -26,7 +26,6 @@ import ( "k8s.io/apimachinery/pkg/util/diff" apiserveroptions "k8s.io/apiserver/pkg/server/options" - genericoptions "k8s.io/apiserver/pkg/server/options" "k8s.io/apiserver/pkg/storage/storagebackend" utilflag "k8s.io/apiserver/pkg/util/flag" auditbuffered "k8s.io/apiserver/plugin/pkg/audit/buffered" @@ -158,7 +157,7 @@ func TestAddFlags(t *testing.T) { EnableWatchCache: true, DefaultWatchCacheSize: 100, }, - SecureServing: genericoptions.WithLoopback(&apiserveroptions.SecureServingOptions{ + SecureServing: apiserveroptions.WithLoopback(&apiserveroptions.SecureServingOptions{ BindAddress: net.ParseIP("192.168.10.20"), BindPort: 6443, ServerCert: apiserveroptions.GeneratableKeyCert{ diff --git a/pkg/apis/storage/fuzzer/fuzzer.go b/pkg/apis/storage/fuzzer/fuzzer.go index f559821f6a8..e39f4e91e13 100644 --- a/pkg/apis/storage/fuzzer/fuzzer.go +++ b/pkg/apis/storage/fuzzer/fuzzer.go @@ -22,7 +22,6 @@ import ( runtimeserializer "k8s.io/apimachinery/pkg/runtime/serializer" api "k8s.io/kubernetes/pkg/apis/core" "k8s.io/kubernetes/pkg/apis/storage" - storageapi "k8s.io/kubernetes/pkg/apis/storage" ) // Funcs returns the fuzzer functions for the storage api group. @@ -32,7 +31,7 @@ var Funcs = func(codecs runtimeserializer.CodecFactory) []interface{} { c.FuzzNoCustom(obj) // fuzz self without calling this function again reclamationPolicies := []api.PersistentVolumeReclaimPolicy{api.PersistentVolumeReclaimDelete, api.PersistentVolumeReclaimRetain} obj.ReclaimPolicy = &reclamationPolicies[c.Rand.Intn(len(reclamationPolicies))] - bindingModes := []storageapi.VolumeBindingMode{storageapi.VolumeBindingImmediate, storageapi.VolumeBindingWaitForFirstConsumer} + bindingModes := []storage.VolumeBindingMode{storage.VolumeBindingImmediate, storage.VolumeBindingWaitForFirstConsumer} obj.VolumeBindingMode = &bindingModes[c.Rand.Intn(len(bindingModes))] }, } diff --git a/pkg/kubelet/config/common_test.go b/pkg/kubelet/config/common_test.go index 5aa1447983a..87820f6a546 100644 --- a/pkg/kubelet/config/common_test.go +++ b/pkg/kubelet/config/common_test.go @@ -29,12 +29,11 @@ import ( "k8s.io/kubernetes/pkg/api/legacyscheme" "k8s.io/kubernetes/pkg/api/testapi" "k8s.io/kubernetes/pkg/apis/core" - api "k8s.io/kubernetes/pkg/apis/core" "k8s.io/kubernetes/pkg/apis/core/validation" "k8s.io/kubernetes/pkg/securitycontext" ) -func noDefault(*api.Pod) error { return nil } +func noDefault(*core.Pod) error { return nil } func TestDecodeSinglePod(t *testing.T) { grace := int64(30) @@ -60,7 +59,7 @@ func TestDecodeSinglePod(t *testing.T) { SecurityContext: securitycontext.ValidSecurityContextWithContainerDefaults(), }}, SecurityContext: &v1.PodSecurityContext{}, - SchedulerName: api.DefaultSchedulerName, + SchedulerName: core.DefaultSchedulerName, }, } json, err := runtime.Encode(testapi.Default.Codec(), pod) @@ -123,7 +122,7 @@ func TestDecodePodList(t *testing.T) { SecurityContext: securitycontext.ValidSecurityContextWithContainerDefaults(), }}, SecurityContext: &v1.PodSecurityContext{}, - SchedulerName: api.DefaultSchedulerName, + SchedulerName: core.DefaultSchedulerName, }, } podList := &v1.PodList{ diff --git a/test/e2e/apps/daemon_set.go b/test/e2e/apps/daemon_set.go index 86f5aab8ac0..202fcdb02b9 100644 --- a/test/e2e/apps/daemon_set.go +++ b/test/e2e/apps/daemon_set.go @@ -24,8 +24,7 @@ import ( apps "k8s.io/api/apps/v1" "k8s.io/api/core/v1" - "k8s.io/apimachinery/pkg/api/errors" - apierrs "k8s.io/apimachinery/pkg/api/errors" + apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" @@ -520,7 +519,7 @@ func setDaemonSetNodeLabels(c clientset.Interface, nodeName string, labels map[s newLabels, _ = separateDaemonSetNodeLabels(newNode.Labels) return true, err } - if se, ok := err.(*apierrs.StatusError); ok && se.ErrStatus.Reason == metav1.StatusReasonConflict { + if se, ok := err.(*apierrors.StatusError); ok && se.ErrStatus.Reason == metav1.StatusReasonConflict { framework.Logf("failed to update node due to resource version conflict") return false, nil } @@ -734,7 +733,7 @@ func curHistory(historyList *apps.ControllerRevisionList, ds *apps.DaemonSet) *a func waitFailedDaemonPodDeleted(c clientset.Interface, pod *v1.Pod) func() (bool, error) { return func() (bool, error) { if _, err := c.CoreV1().Pods(pod.Namespace).Get(pod.Name, metav1.GetOptions{}); err != nil { - if errors.IsNotFound(err) { + if apierrors.IsNotFound(err) { return true, nil } return false, fmt.Errorf("failed to get failed daemon pod %q: %v", pod.Name, err) diff --git a/test/e2e/storage/vsphere/vsphere_utils.go b/test/e2e/storage/vsphere/vsphere_utils.go index 7f5cb5e34be..40d834ea4fd 100644 --- a/test/e2e/storage/vsphere/vsphere_utils.go +++ b/test/e2e/storage/vsphere/vsphere_utils.go @@ -32,7 +32,6 @@ import ( "github.com/vmware/govmomi/object" "github.com/vmware/govmomi/vim25/mo" vim25types "github.com/vmware/govmomi/vim25/types" - vimtypes "github.com/vmware/govmomi/vim25/types" "k8s.io/api/core/v1" storage "k8s.io/api/storage/v1" @@ -617,7 +616,7 @@ func poweroffNodeVM(nodeName string, vm *object.VirtualMachine) { _, err := vm.PowerOff(ctx) Expect(err).NotTo(HaveOccurred()) - err = vm.WaitForPowerState(ctx, vimtypes.VirtualMachinePowerStatePoweredOff) + err = vm.WaitForPowerState(ctx, vim25types.VirtualMachinePowerStatePoweredOff) Expect(err).NotTo(HaveOccurred(), "Unable to power off the node") } @@ -629,7 +628,7 @@ func poweronNodeVM(nodeName string, vm *object.VirtualMachine) { framework.Logf("Powering on node VM %s", nodeName) vm.PowerOn(ctx) - err := vm.WaitForPowerState(ctx, vimtypes.VirtualMachinePowerStatePoweredOn) + err := vm.WaitForPowerState(ctx, vim25types.VirtualMachinePowerStatePoweredOn) Expect(err).NotTo(HaveOccurred(), "Unable to power on the node") } diff --git a/test/integration/auth/svcaccttoken_test.go b/test/integration/auth/svcaccttoken_test.go index e6fa7b31366..0978de010b3 100644 --- a/test/integration/auth/svcaccttoken_test.go +++ b/test/integration/auth/svcaccttoken_test.go @@ -36,7 +36,6 @@ import ( utilfeature "k8s.io/apiserver/pkg/util/feature" utilfeaturetesting "k8s.io/apiserver/pkg/util/feature/testing" clientset "k8s.io/client-go/kubernetes" - externalclientset "k8s.io/client-go/kubernetes" certutil "k8s.io/client-go/util/cert" "k8s.io/kubernetes/pkg/apis/core" serviceaccountgetter "k8s.io/kubernetes/pkg/controller/serviceaccount" @@ -536,7 +535,7 @@ func TestServiceAccountTokenCreate(t *testing.T) { }) } -func doTokenReview(t *testing.T, cs externalclientset.Interface, treq *authenticationv1.TokenRequest, expectErr bool) { +func doTokenReview(t *testing.T, cs clientset.Interface, treq *authenticationv1.TokenRequest, expectErr bool) { t.Helper() trev, err := cs.AuthenticationV1().TokenReviews().Create(&authenticationv1.TokenReview{ Spec: authenticationv1.TokenReviewSpec{