From 38ba4c1cfdcd22fc98bbdd2e349877fc26e8b070 Mon Sep 17 00:00:00 2001 From: Madhu Rajanna Date: Wed, 15 Apr 2020 09:08:16 +0530 Subject: [PATCH] Fix goimports issue in CI Fix below error in current codebase File is not `goimports`-ed with -local github.com/ceph/ceph-csi Signed-off-by: Madhu Rajanna (cherry picked from commit 5b14cc9272a4449878651118b15ce3c7ef559328) --- cmd/cephcsi.go | 1 + pkg/cephfs/controllerserver.go | 1 + pkg/cephfs/util.go | 6 +++--- pkg/csi-common/utils.go | 1 + pkg/liveness/liveness.go | 1 + pkg/rbd/rbd_util.go | 1 + 6 files changed, 8 insertions(+), 3 deletions(-) diff --git a/cmd/cephcsi.go b/cmd/cephcsi.go index 90f50ff6d..2c3f92a6b 100644 --- a/cmd/cephcsi.go +++ b/cmd/cephcsi.go @@ -28,6 +28,7 @@ import ( "github.com/ceph/ceph-csi/pkg/liveness" "github.com/ceph/ceph-csi/pkg/rbd" "github.com/ceph/ceph-csi/pkg/util" + "k8s.io/klog" ) diff --git a/pkg/cephfs/controllerserver.go b/pkg/cephfs/controllerserver.go index d203a327c..afb0f2d24 100644 --- a/pkg/cephfs/controllerserver.go +++ b/pkg/cephfs/controllerserver.go @@ -21,6 +21,7 @@ import ( csicommon "github.com/ceph/ceph-csi/pkg/csi-common" "github.com/ceph/ceph-csi/pkg/util" + "github.com/container-storage-interface/spec/lib/go/csi" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/pkg/cephfs/util.go b/pkg/cephfs/util.go index da4136e86..9f57d7de3 100644 --- a/pkg/cephfs/util.go +++ b/pkg/cephfs/util.go @@ -24,12 +24,12 @@ import ( "os" "os/exec" + "github.com/ceph/ceph-csi/pkg/util" + + "github.com/container-storage-interface/spec/lib/go/csi" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" "k8s.io/klog" - - "github.com/ceph/ceph-csi/pkg/util" - "github.com/container-storage-interface/spec/lib/go/csi" ) type volumeID string diff --git a/pkg/csi-common/utils.go b/pkg/csi-common/utils.go index 6eca28afb..f9b14b9c8 100644 --- a/pkg/csi-common/utils.go +++ b/pkg/csi-common/utils.go @@ -24,6 +24,7 @@ import ( "sync/atomic" "github.com/ceph/ceph-csi/pkg/util" + "github.com/container-storage-interface/spec/lib/go/csi" "github.com/kubernetes-csi/csi-lib-utils/protosanitizer" "google.golang.org/grpc" diff --git a/pkg/liveness/liveness.go b/pkg/liveness/liveness.go index eff2673ea..f1e160aeb 100644 --- a/pkg/liveness/liveness.go +++ b/pkg/liveness/liveness.go @@ -21,6 +21,7 @@ import ( "time" "github.com/ceph/ceph-csi/pkg/util" + connlib "github.com/kubernetes-csi/csi-lib-utils/connection" "github.com/kubernetes-csi/csi-lib-utils/metrics" "github.com/kubernetes-csi/csi-lib-utils/rpc" diff --git a/pkg/rbd/rbd_util.go b/pkg/rbd/rbd_util.go index 937b265a6..a9044bb2f 100644 --- a/pkg/rbd/rbd_util.go +++ b/pkg/rbd/rbd_util.go @@ -29,6 +29,7 @@ import ( "time" "github.com/ceph/ceph-csi/pkg/util" + "github.com/ceph/go-ceph/rados" librbd "github.com/ceph/go-ceph/rbd" "github.com/container-storage-interface/spec/lib/go/csi"