Merge pull request #244 from msau42/update-lib

Update lib-external-provisioner and cleanup constraints

Gopkg.toml

@@ -20,46 +20,32 @@
 #  name = "github.com/x/y"
 #  version = "2.4.0"
 
+# TODO: update to 1.1.0
 [[constraint]]
   name = "github.com/container-storage-interface/spec"
   version = "1.0.0"
 
+# TODO: update to latest
 [[constraint]]
   name = "github.com/kubernetes-csi/csi-test"
   version = "~v1.0.3"
 
+# TODO: remove when official 3.0.0 tagged
 [[constraint]]
-  name = "github.com/kubernetes-csi/external-snapshotter"
-  version = "1.0.0-rc4"
-
-[[constraint]]
-  name = "github.com/kubernetes-sigs/sig-storage-lib-external-provisioner"
-  version = "v2.2.0"
+  name = "sigs.k8s.io/sig-storage-lib-external-provisioner"
+  version = ">=v3.0.0-beta"
 
+# TODO: can this be removed?
 [[constraint]]
   name = "google.golang.org/grpc"
   version = "1.9.2"
 
-[[constraint]]
-  name = "k8s.io/apimachinery"
-  version = "kubernetes-1.13.0-beta.1"
-
+# TODO: remove when official 11.0.0 tagged
 [[constraint]]
   name = "k8s.io/client-go"
-  version = "kubernetes-1.13.0-beta.1"
-
-[[constraint]]
-  name = "k8s.io/api"
-  version = "kubernetes-1.13.0-beta.1"
-
-[[constraint]]
-  name = "k8s.io/csi-api"
-  version = "kubernetes-1.13.0-beta.1"
-
-[[constraint]]
-  name = "k8s.io/apiserver"
-  version = "kubernetes-1.13.0-beta.1"
+  version = "kubernetes-1.14.0-beta.2"
 
+# TODO: remove when official 0.4.0 tagged
 [[constraint]]
   name = "github.com/kubernetes-csi/csi-lib-utils"
   version = ">=0.4.0-rc1"

cmd/csi-provisioner/csi-provisioner.go

@@ -31,8 +31,8 @@ import (
 
 	ctrl "github.com/kubernetes-csi/external-provisioner/pkg/controller"
 	snapclientset "github.com/kubernetes-csi/external-snapshotter/pkg/client/clientset/versioned"
-	"github.com/kubernetes-sigs/sig-storage-lib-external-provisioner/controller"
 	csiclientset "k8s.io/csi-api/pkg/client/clientset/versioned"
+	"sigs.k8s.io/sig-storage-lib-external-provisioner/controller"
 
 	"k8s.io/apimachinery/pkg/util/wait"
 	"k8s.io/client-go/kubernetes"

pkg/controller/controller.go

@@ -29,8 +29,8 @@ import (
 	"github.com/kubernetes-csi/external-provisioner/pkg/features"
 	snapapi "github.com/kubernetes-csi/external-snapshotter/pkg/apis/volumesnapshot/v1alpha1"
 	snapclientset "github.com/kubernetes-csi/external-snapshotter/pkg/client/clientset/versioned"
-	"github.com/kubernetes-sigs/sig-storage-lib-external-provisioner/controller"
-	"github.com/kubernetes-sigs/sig-storage-lib-external-provisioner/util"
+	"sigs.k8s.io/sig-storage-lib-external-provisioner/controller"
+	"sigs.k8s.io/sig-storage-lib-external-provisioner/util"
 
 	"k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"

pkg/controller/controller_test.go

@@ -35,7 +35,6 @@ import (
 	"github.com/kubernetes-csi/external-provisioner/pkg/features"
 	crdv1 "github.com/kubernetes-csi/external-snapshotter/pkg/apis/volumesnapshot/v1alpha1"
 	"github.com/kubernetes-csi/external-snapshotter/pkg/client/clientset/versioned/fake"
-	"github.com/kubernetes-sigs/sig-storage-lib-external-provisioner/controller"
 	"google.golang.org/grpc"
 	corev1 "k8s.io/api/core/v1"
 	v1 "k8s.io/api/core/v1"
@@ -50,6 +49,7 @@ import (
 	fakeclientset "k8s.io/client-go/kubernetes/fake"
 	k8stesting "k8s.io/client-go/testing"
 	fakecsiclientset "k8s.io/csi-api/pkg/client/clientset/versioned/fake"
+	"sigs.k8s.io/sig-storage-lib-external-provisioner/controller"
 )
 
 const (