Merge pull request kubernetes-csi#40 from sbezverk/csi_0.2.0_breaking…

…_changes CSI 0.2.0 breaking changes
suneeth51 · Feb 9, 2018 · f333b2e · f333b2e
2 parents c15f2a6 + 237e427
commit f333b2e
Show file tree

Hide file tree

Showing 9 changed files with 339 additions and 417 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -27,7 +27,7 @@
 
 [[constraint]]
   name = "github.com/container-storage-interface/spec"
-  version = "0.1.0"
+  branch = "master"
 
 [[constraint]]
   name = "github.com/golang/mock"

diff --git a/driver/driver.mock.go b/driver/driver.mock.go
diff --git a/hack/e2e.sh b/hack/e2e.sh
@@ -5,6 +5,7 @@ UDS="/tmp/e2e-csi-sanity.sock"
 CSI_ENDPOINTS="127.0.0.1:9998"
 CSI_ENDPOINTS="$CSI_ENDPOINTS unix://${UDS}"
 CSI_ENDPOINTS="$CSI_ENDPOINTS ${UDS}"
+CSI_MOCK_VERSION="support/csi-0.2.0"
 
 #
 # $1 - endpoint for mock.
@@ -23,7 +24,16 @@ runTest()
 	fi
 }
 
-go get -u github.com/thecodeteam/gocsi/mock
+#
+# TODO Once 0.2.0 change gets merged into gocsi repo, switch back to "go get"
+#
+git clone https://github.com/thecodeteam/gocsi $GOPATH/src/github.com/thecodeteam/gocsi
+pushd $GOPATH/src/github.com/thecodeteam/gocsi
+git checkout $CSI_MOCK_VERSION
+make build
+popd 
+#
+#go get -u github.com/thecodeteam/gocsi/mock
 cd cmd/csi-sanity
   make clean install || exit 1
 cd ../..