Skip to content

Commit

Permalink
update to csi-test v3.0.0
Browse files Browse the repository at this point in the history
v3.0.0 fixed "go mod" support by adding the /v3 suffix to import paths
(kubernetes-csi/csi-test#232). dep currently
does not support that
(golang/dep#1962 (comment)) and
can only import that with symlink workarounds in csi-test and by
disabling pruning.
  • Loading branch information
pohly committed Oct 29, 2019
1 parent 2f327f7 commit 79b03e9
Show file tree
Hide file tree
Showing 70 changed files with 5,400 additions and 31 deletions.
20 changes: 12 additions & 8 deletions Gopkg.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 6 additions & 1 deletion Gopkg.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@
go-tests = true
unused-packages = true

[[prune.project]]
name = "github.com/kubernetes-csi/csi-test"
unused-packages = false

[[constraint]]
name = "github.com/container-storage-interface/spec"
version = "1.0.0"
Expand All @@ -42,7 +46,8 @@

[[constraint]]
name = "github.com/kubernetes-csi/csi-test"
version = "2.1.0"
source = "github.com/pohly/csi-test"
branch = "fix-semver"

# We have to select the right version by name because of the "kubernetes-" prefix, dep doesn't
# recognize these as normal releases. Upstream is considering to change the tagging,
Expand Down
8 changes: 4 additions & 4 deletions test/e2e/storage/sanity.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ import (
"time"

"github.com/container-storage-interface/spec/lib/go/csi"
"github.com/kubernetes-csi/csi-test/pkg/sanity"
sanityutils "github.com/kubernetes-csi/csi-test/utils"
"github.com/kubernetes-csi/csi-test/v3/pkg/sanity"
sanityutils "github.com/kubernetes-csi/csi-test/v3/utils"
"google.golang.org/grpc"
appsv1 "k8s.io/api/apps/v1"
v1 "k8s.io/api/core/v1"
Expand All @@ -43,9 +43,9 @@ import (
clientset "k8s.io/client-go/kubernetes"
clientexec "k8s.io/client-go/util/exec"
"k8s.io/kubernetes/test/e2e/framework"
testutils "k8s.io/kubernetes/test/utils"
e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
e2essh "k8s.io/kubernetes/test/e2e/framework/ssh"
testutils "k8s.io/kubernetes/test/utils"

. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
Expand All @@ -67,7 +67,7 @@ var _ = Describe("sanity", func() {
// and deletes all extra entries that it does not know about.
TargetPath: "/var/lib/kubelet/plugins/kubernetes.io/csi/pv/pmem-sanity-target.XXXXXX",
StagingPath: "/var/lib/kubelet/plugins/kubernetes.io/csi/pv/pmem-sanity-staging.XXXXXX",
IDGen: &sanity.DefaultIDGenerator{},
IDGen: &sanity.DefaultIDGenerator{},
}

f := framework.NewDefaultFramework("pmem")
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions vendor/github.com/kubernetes-csi/csi-test/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

25 changes: 25 additions & 0 deletions vendor/github.com/kubernetes-csi/csi-test/.prow.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 16 additions & 0 deletions vendor/github.com/kubernetes-csi/csi-test/CHANGELOG-2.1.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions vendor/github.com/kubernetes-csi/csi-test/CHANGELOG-2.2.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 18 additions & 0 deletions vendor/github.com/kubernetes-csi/csi-test/CHANGELOG-2.3.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 22 additions & 0 deletions vendor/github.com/kubernetes-csi/csi-test/CONTRIBUTING.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

34 changes: 34 additions & 0 deletions vendor/github.com/kubernetes-csi/csi-test/Makefile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions vendor/github.com/kubernetes-csi/csi-test/OWNERS

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

47 changes: 47 additions & 0 deletions vendor/github.com/kubernetes-csi/csi-test/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 14 additions & 0 deletions vendor/github.com/kubernetes-csi/csi-test/SECURITY_CONTACTS

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 79b03e9

Please sign in to comment.