Update csi/v0 import to csi/

Author: msau42

pkg/controller/controller.go

@@ -25,6 +25,7 @@ import (
 	"strings"
 	"time"
 
+	"k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
 	_ "k8s.io/apimachinery/pkg/util/json"
 
@@ -35,7 +36,6 @@ import (
 	snapapi "github.com/kubernetes-csi/external-snapshotter/pkg/apis/volumesnapshot/v1alpha1"
 	snapclientset "github.com/kubernetes-csi/external-snapshotter/pkg/client/clientset/versioned"
 
-	"k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/apimachinery/pkg/util/validation"
@@ -48,7 +48,7 @@ import (
 	"google.golang.org/grpc/connectivity"
 	"google.golang.org/grpc/status"
 
-	"github.com/container-storage-interface/spec/lib/go/csi/v0"
+	"github.com/container-storage-interface/spec/lib/go/csi"
 	csiclientset "k8s.io/csi-api/pkg/client/clientset/versioned"
 
 	"github.com/kubernetes-csi/external-provisioner/pkg/features"

pkg/controller/controller_test.go

@@ -25,7 +25,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/container-storage-interface/spec/lib/go/csi/v0"
+	"github.com/container-storage-interface/spec/lib/go/csi"
 	"github.com/golang/mock/gomock"
 	"github.com/kubernetes-csi/csi-test/driver"
 	"github.com/kubernetes-csi/external-provisioner/pkg/features"
@@ -434,9 +434,9 @@ func TestCreateDriverReturnsInvalidCapacityDuringProvision(t *testing.T) {
 	// Requested PVC with requestedBytes storage
 	opts := controller.VolumeOptions{
 		PersistentVolumeReclaimPolicy: v1.PersistentVolumeReclaimDelete,
-		PVName:     "test-name",
-		PVC:        createFakePVC(requestedBytes),
-		Parameters: map[string]string{},
+		PVName:                        "test-name",
+		PVC:                           createFakePVC(requestedBytes),
+		Parameters:                    map[string]string{},
 	}
 
 	// Drivers CreateVolume response with lower capacity bytes than request
@@ -734,8 +734,8 @@ func TestProvision(t *testing.T) {
 		"normal provision": {
 			volOpts: controller.VolumeOptions{
 				PersistentVolumeReclaimPolicy: v1.PersistentVolumeReclaimDelete,
-				PVName: "test-name",
-				PVC:    createFakePVC(requestedBytes),
+				PVName:                        "test-name",
+				PVC:                           createFakePVC(requestedBytes),
 				Parameters: map[string]string{
 					"fstype": "ext3",
 				},
@@ -759,7 +759,7 @@ func TestProvision(t *testing.T) {
 		"provision with access mode multi node multi writer": {
 			volOpts: controller.VolumeOptions{
 				PersistentVolumeReclaimPolicy: v1.PersistentVolumeReclaimDelete,
-				PVName: "test-name",
+				PVName:                        "test-name",
 				PVC: &v1.PersistentVolumeClaim{
 					ObjectMeta: metav1.ObjectMeta{
 						UID: "testid",
@@ -807,7 +807,7 @@ func TestProvision(t *testing.T) {
 		"provision with access mode multi node multi readonly": {
 			volOpts: controller.VolumeOptions{
 				PersistentVolumeReclaimPolicy: v1.PersistentVolumeReclaimDelete,
-				PVName: "test-name",
+				PVName:                        "test-name",
 				PVC: &v1.PersistentVolumeClaim{
 					ObjectMeta: metav1.ObjectMeta{
 						UID: "testid",
@@ -855,7 +855,7 @@ func TestProvision(t *testing.T) {
 		"provision with access mode single writer": {
 			volOpts: controller.VolumeOptions{
 				PersistentVolumeReclaimPolicy: v1.PersistentVolumeReclaimDelete,
-				PVName: "test-name",
+				PVName:                        "test-name",
 				PVC: &v1.PersistentVolumeClaim{
 					ObjectMeta: metav1.ObjectMeta{
 						UID: "testid",
@@ -903,7 +903,7 @@ func TestProvision(t *testing.T) {
 		"provision with multiple access modes": {
 			volOpts: controller.VolumeOptions{
 				PersistentVolumeReclaimPolicy: v1.PersistentVolumeReclaimDelete,
-				PVName: "test-name",
+				PVName:                        "test-name",
 				PVC: &v1.PersistentVolumeClaim{
 					ObjectMeta: metav1.ObjectMeta{
 						UID: "testid",
@@ -1042,7 +1042,7 @@ func TestProvision(t *testing.T) {
 		"provision with mount options": {
 			volOpts: controller.VolumeOptions{
 				PersistentVolumeReclaimPolicy: v1.PersistentVolumeReclaimDelete,
-				PVName: "test-name",
+				PVName:                        "test-name",
 				PVC: &v1.PersistentVolumeClaim{
 					ObjectMeta: metav1.ObjectMeta{
 						UID: "testid",
@@ -1307,7 +1307,7 @@ func TestProvisionFromSnapshot(t *testing.T) {
 		"provision with volume snapshot data source": {
 			volOpts: controller.VolumeOptions{
 				PersistentVolumeReclaimPolicy: v1.PersistentVolumeReclaimDelete,
-				PVName: "test-name",
+				PVName:                        "test-name",
 				PVC: &v1.PersistentVolumeClaim{
 					ObjectMeta: metav1.ObjectMeta{
 						UID: "testid",

pkg/controller/topology.go

@@ -24,7 +24,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/container-storage-interface/spec/lib/go/csi/v0"
+	"github.com/container-storage-interface/spec/lib/go/csi"
 	"github.com/golang/glog"
 	"k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

pkg/controller/topology_test.go

@@ -18,15 +18,16 @@ package controller
 
 import (
 	"fmt"
-	"github.com/container-storage-interface/spec/lib/go/csi/v0"
+	"testing"
+
+	"github.com/container-storage-interface/spec/lib/go/csi"
 	"k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/sets"
 	fakeclientset "k8s.io/client-go/kubernetes/fake"
 	csiv1alpha1 "k8s.io/csi-api/pkg/apis/csi/v1alpha1"
 	fakecsiclientset "k8s.io/csi-api/pkg/client/clientset/versioned/fake"
 	"k8s.io/kubernetes/pkg/apis/core/helper"
-	"testing"
 )
 
 const testDriverName = "com.example.csi/test-driver"