fix type error

Signed-off-by: wph95 <wph657856467@gmail.com>
kubernetes · Sep 21, 2018 · 7b1e632 · 7b1e632
1 parent b82094a
commit 7b1e632
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 20 deletions.
diff --git a/pkg/kubelet/volumemanager/reconciler/BUILD b/pkg/kubelet/volumemanager/reconciler/BUILD
@@ -39,7 +39,16 @@ go_test(
     embed = [":go_default_library"],
     deps = [
         "//pkg/features:go_default_library",
+        "//pkg/kubelet/config:go_default_library",
+        "//pkg/kubelet/configmap:go_default_library",
+        "//pkg/kubelet/container/testing:go_default_library",
+        "//pkg/kubelet/pod:go_default_library",
+        "//pkg/kubelet/pod/testing:go_default_library",
+        "//pkg/kubelet/secret:go_default_library",
+        "//pkg/kubelet/status:go_default_library",
+        "//pkg/kubelet/status/testing:go_default_library",
         "//pkg/kubelet/volumemanager/cache:go_default_library",
+        "//pkg/kubelet/volumemanager/populator:go_default_library",
         "//pkg/util/mount:go_default_library",
         "//pkg/volume:go_default_library",
         "//pkg/volume/testing:go_default_library",
@@ -50,6 +59,7 @@ go_test(
         "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/types:go_default_library",
+        "//staging/src/k8s.io/apimachinery/pkg/util/sets:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/util/wait:go_default_library",
         "//staging/src/k8s.io/apiserver/pkg/util/feature:go_default_library",
         "//staging/src/k8s.io/client-go/kubernetes/fake:go_default_library",

diff --git a/pkg/kubelet/volumemanager/reconciler/reconciler.go b/pkg/kubelet/volumemanager/reconciler/reconciler.go
@@ -279,7 +279,7 @@ func (rc *reconciler) reconcile() {
 		// Check DevicePath to avoid device unmounted slow, and with desiredStateOfWorld Volume is exists,
 		if (!rc.desiredStateOfWorld.VolumeExists(attachedVolume.VolumeName) &&
 			!rc.operationExecutor.IsOperationPending(attachedVolume.VolumeName, nestedpendingoperations.EmptyUniquePodName)) ||
-			attachedVolume.DevicePath == ""	{
+			attachedVolume.DevicePath == "" {
 			if attachedVolume.GloballyMounted {
 				// Volume is globally mounted to device, unmount it
 				glog.V(5).Infof(attachedVolume.GenerateMsgDetailed("Starting operationExecutor.UnmountDevice", ""))

diff --git a/pkg/kubelet/volumemanager/reconciler/reconciler_test.go b/pkg/kubelet/volumemanager/reconciler/reconciler_test.go
@@ -27,28 +27,28 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	k8stypes "k8s.io/apimachinery/pkg/types"
+	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/apimachinery/pkg/util/wait"
 	utilfeature "k8s.io/apiserver/pkg/util/feature"
 	"k8s.io/client-go/kubernetes/fake"
 	core "k8s.io/client-go/testing"
 	"k8s.io/client-go/tools/record"
 	"k8s.io/kubernetes/pkg/features"
+	"k8s.io/kubernetes/pkg/kubelet/config"
+	"k8s.io/kubernetes/pkg/kubelet/configmap"
+	containertest "k8s.io/kubernetes/pkg/kubelet/container/testing"
 	kubepod "k8s.io/kubernetes/pkg/kubelet/pod"
+	podtest "k8s.io/kubernetes/pkg/kubelet/pod/testing"
+	"k8s.io/kubernetes/pkg/kubelet/secret"
+	"k8s.io/kubernetes/pkg/kubelet/status"
+	statustest "k8s.io/kubernetes/pkg/kubelet/status/testing"
 	"k8s.io/kubernetes/pkg/kubelet/volumemanager/cache"
+	"k8s.io/kubernetes/pkg/kubelet/volumemanager/populator"
 	"k8s.io/kubernetes/pkg/util/mount"
 	"k8s.io/kubernetes/pkg/volume"
 	volumetesting "k8s.io/kubernetes/pkg/volume/testing"
 	"k8s.io/kubernetes/pkg/volume/util"
 	"k8s.io/kubernetes/pkg/volume/util/operationexecutor"
-	"k8s.io/kubernetes/pkg/kubelet/secret"
-	"k8s.io/kubernetes/pkg/kubelet/configmap"
-	"k8s.io/kubernetes/pkg/kubelet/status"
-	statustest "k8s.io/kubernetes/pkg/kubelet/status/testing"
-	podtest "k8s.io/kubernetes/pkg/kubelet/pod/testing"
-	containertest "k8s.io/kubernetes/pkg/kubelet/container/testing"
-	"k8s.io/kubernetes/pkg/kubelet/volumemanager/populator"
-	"k8s.io/kubernetes/pkg/kubelet/config"
-	"k8s.io/apimachinery/pkg/util/sets"
 )
 
 const (
@@ -453,7 +453,7 @@ func Test_Run_Positive_VolumeUnmountControllerAttachEnabled(t *testing.T) {
 // Call DesiredStateOfWorldPopulator() in Five Seconds
 // Verifies one UnMountDevice call is made.
 func Test_Run_DeviceUnMount(t *testing.T) {
-	run_DeviceUnMount(t, 1*reconcilerLoopSleepLongDuration)
+	runDeviceUnMount(t, 1*reconcilerLoopSleepLongDuration)
 }
 
 // Populates desiredStateOfWorld cache with one volume/pod.
@@ -465,7 +465,7 @@ func Test_Run_DeviceUnMount(t *testing.T) {
 // Call DesiredStateOfWorldPopulator() in Five Seconds
 // Verifies one UnMountDevice call is made.
 func Test_Run_DeviceUnMountDelay(t *testing.T) {
-	run_DeviceUnMount(t, 10*reconcilerLoopSleepLongDuration)
+	runDeviceUnMount(t, 10*reconcilerLoopSleepLongDuration)
 }
 
 // Populates desiredStateOfWorld cache with one volume/pod.
@@ -476,14 +476,14 @@ func Test_Run_DeviceUnMountDelay(t *testing.T) {
 // Deletes volume/pod from desired state of world.
 // Call DesiredStateOfWorldPopulator() in Five Seconds
 // Verifies one UnMountDevice call is made.
-func run_DeviceUnMount(t *testing.T, delay time.Duration) {
+func runDeviceUnMount(t *testing.T, delay time.Duration) {
 	// Arrange
 	volumePluginMgr, fakePlugin := volumetesting.GetTestVolumePluginMgr(t)
 	fakePlugin.DelayUnMountDevice = delay
 	fakePlugin.CheckDevicePath = true
 	dsw := cache.NewDesiredStateOfWorld(volumePluginMgr)
 	asw := cache.NewActualStateOfWorld(nodeName, volumePluginMgr)
-	kubeClient :=createTestClient()
+	kubeClient := createTestClient()
 	fakeRecorder := &record.FakeRecorder{}
 	fakeHandler := volumetesting.NewBlockVolumePathHandler()
 	oex := operationexecutor.NewOperationExecutor(operationexecutor.NewOperationGenerator(
@@ -560,16 +560,16 @@ func run_DeviceUnMount(t *testing.T, delay time.Duration) {
 	time.Sleep(4 * reconcilerLoopSleepLongDuration)
 	generatedVolumeName, err = dsw.AddPodToVolume(
 		podName, pod, volumeSpec, volumeSpec.Name(), "" /* volumeGidValue */)
-	run_desired_state_of_world_populator(dsw, asw)
+	runDesiredStateOfWorldPopulator(dsw, asw)
 	waitForDetach(t, fakePlugin, generatedVolumeName, asw)
 
 	// Assert
 	assert.NoError(t, volumetesting.VerifyUnMountDeviceCallCount(
 		1 /* expectedUnMountDeviceCallCount */, fakePlugin))
 }
 
-func run_desired_state_of_world_populator(dsw cache.DesiredStateOfWorld,
-	asw cache.ActualStateOfWorld, ) {
+func runDesiredStateOfWorldPopulator(dsw cache.DesiredStateOfWorld,
+	asw cache.ActualStateOfWorld) {
 	containers := []v1.Container{
 		{
 			VolumeMounts: []v1.VolumeMount{
@@ -582,7 +582,7 @@ func run_desired_state_of_world_populator(dsw cache.DesiredStateOfWorld,
 	}
 
 	pv := &v1.PersistentVolume{
-		ObjectMeta: metav1.ObjectMeta{Name: "pv", UID: "pvuid",},
+		ObjectMeta: metav1.ObjectMeta{Name: "pv", UID: "pvuid"},
 		Spec: v1.PersistentVolumeSpec{
 			ClaimRef: &v1.ObjectReference{Name: "pvc"},
 		},

diff --git a/pkg/volume/testing/BUILD b/pkg/volume/testing/BUILD
@@ -30,6 +30,7 @@ go_library(
         "//staging/src/k8s.io/client-go/tools/record:go_default_library",
         "//staging/src/k8s.io/client-go/util/testing:go_default_library",
         "//staging/src/k8s.io/csi-api/pkg/client/clientset/versioned:go_default_library",
+        "//vendor/github.com/pkg/errors:go_default_library",
         "//vendor/github.com/stretchr/testify/mock:go_default_library",
     ],
 )

diff --git a/pkg/volume/testing/testing.go b/pkg/volume/testing/testing.go
@@ -27,6 +27,7 @@ import (
 	"testing"
 	"time"
 
+	"github.com/pkg/errors"
 	authenticationv1 "k8s.io/api/authentication/v1"
 	"k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
@@ -44,7 +45,6 @@ import (
 	"k8s.io/kubernetes/pkg/volume/util"
 	"k8s.io/kubernetes/pkg/volume/util/recyclerclient"
 	"k8s.io/kubernetes/pkg/volume/util/volumepathhandler"
-	"github.com/pkg/errors"
 )
 
 // fakeVolumeHost is useful for testing volume plugins.
@@ -250,7 +250,7 @@ type FakeVolumePlugin struct {
 	BlockVolumeMappers   []*FakeVolume
 	BlockVolumeUnmappers []*FakeVolume
 
-	CheckDevicePath     bool
+	CheckDevicePath    bool
 	DelayUnMountDevice time.Duration
 }