Merge pull request kubernetes-csi#209 from alex1989hu/fix/gomod-v2-pa…

…ckage

fix: go module requirements for semantic versioning

cmd/csi-attacher/main.go

@@ -36,8 +36,8 @@ import (
 	"github.com/kubernetes-csi/csi-lib-utils/leaderelection"
 	"github.com/kubernetes-csi/csi-lib-utils/metrics"
 	"github.com/kubernetes-csi/csi-lib-utils/rpc"
-	"github.com/kubernetes-csi/external-attacher/pkg/attacher"
-	"github.com/kubernetes-csi/external-attacher/pkg/controller"
+	"github.com/kubernetes-csi/external-attacher/v2/pkg/attacher"
+	"github.com/kubernetes-csi/external-attacher/v2/pkg/controller"
 	"google.golang.org/grpc"
 )
 

go.mod

@@ -1,6 +1,6 @@
-module github.com/kubernetes-csi/external-attacher
+module github.com/kubernetes-csi/external-attacher/v2
 
-go 1.12
+go 1.13
 
 require (
 	github.com/container-storage-interface/spec v1.2.0

pkg/controller/csi_handler.go

@@ -25,7 +25,7 @@ import (
 
 	"k8s.io/klog"
 
-	"github.com/kubernetes-csi/external-attacher/pkg/attacher"
+	"github.com/kubernetes-csi/external-attacher/v2/pkg/attacher"
 	v1 "k8s.io/api/core/v1"
 	storage "k8s.io/api/storage/v1beta1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

pkg/controller/csi_handler_test.go

@@ -22,7 +22,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/kubernetes-csi/external-attacher/pkg/attacher"
+	"github.com/kubernetes-csi/external-attacher/v2/pkg/attacher"
 
 	v1 "k8s.io/api/core/v1"
 	storage "k8s.io/api/storage/v1beta1"

pkg/controller/framework_test.go

@@ -27,7 +27,7 @@ import (
 
 	"github.com/container-storage-interface/spec/lib/go/csi"
 	"github.com/davecgh/go-spew/spew"
-	"github.com/kubernetes-csi/external-attacher/pkg/attacher"
+	"github.com/kubernetes-csi/external-attacher/v2/pkg/attacher"
 
 	v1 "k8s.io/api/core/v1"
 	storage "k8s.io/api/storage/v1beta1"

pkg/controller/trivial_handler_test.go

@@ -20,7 +20,7 @@ import (
 	"errors"
 	"testing"
 
-	"github.com/kubernetes-csi/external-attacher/pkg/attacher"
+	"github.com/kubernetes-csi/external-attacher/v2/pkg/attacher"
 
 	storage "k8s.io/api/storage/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"

v2/README.md

@@ -0,0 +1,18 @@
+This directory mirrors the source code via symlinks.
+This makes it possible to vendor v2.x releases of
+external-attacher with `dep` versions that do not
+support semantic imports. Support for that is currently
+[pending in dep](https://github.com/golang/dep/pull/1963).
+
+If users of dep have enabled pruning, they must disable if
+for external-attacher in their Gopk.toml, like this:
+
+```toml
+[prune]
+  go-tests = true
+  unused-packages = true
+
+  [[prune.project]]
+    name = "github.com/kubernetes-csi/external-attacher"
+    unused-packages = false
+```

v2/cmd/csi-attacher/main.go

@@ -0,0 +1 @@
+../../../cmd/csi-attacher/main.go

v2/pkg/attacher/attacher.go

@@ -0,0 +1 @@
+../../../pkg/attacher/attacher.go

v2/pkg/attacher/attacher_test.go

@@ -0,0 +1 @@
+../../../pkg/attacher/attacher_test.go

v2/pkg/attacher/lister.go

@@ -0,0 +1 @@
+../../../pkg/attacher/lister.go

v2/pkg/controller/controller.go

@@ -0,0 +1 @@
+../../../pkg/controller/controller.go

v2/pkg/controller/controller_test.go

@@ -0,0 +1 @@
+../../../pkg/controller/controller_test.go

v2/pkg/controller/csi_handler.go

@@ -0,0 +1 @@
+../../../pkg/controller/csi_handler.go

v2/pkg/controller/csi_handler_test.go

@@ -0,0 +1 @@
+../../../pkg/controller/csi_handler_test.go

v2/pkg/controller/framework_test.go

@@ -0,0 +1 @@
+../../../pkg/controller/framework_test.go

v2/pkg/controller/trivial_handler.go

@@ -0,0 +1 @@
+../../../pkg/controller/trivial_handler.go

v2/pkg/controller/trivial_handler_test.go

@@ -0,0 +1 @@
+../../../pkg/controller/trivial_handler_test.go

v2/pkg/controller/util.go

@@ -0,0 +1 @@
+../../../pkg/controller/util.go

v2/pkg/controller/util_test.go

@@ -0,0 +1 @@
+../../../pkg/controller/util_test.go