diff --git a/.Gopkg.toml b/.Gopkg.toml index 6baacca..af85908 100644 --- a/.Gopkg.toml +++ b/.Gopkg.toml @@ -42,17 +42,21 @@ name = "golang.org/x/time" [[constraint]] - branch = "master" + branch = "release-1.12" name = "k8s.io/api" [[constraint]] - branch = "master" + branch = "release-1.12" name = "k8s.io/apimachinery" [[constraint]] - branch = "master" + branch = "release-9.0" name = "k8s.io/client-go" +[[constraint]] + branch = "release-1.12" + name = "k8s.io/kubernetes" + [prune] go-tests = true unused-packages = true diff --git a/controller/controller.go b/controller/controller.go index 0878c51..2aabc53 100644 --- a/controller/controller.go +++ b/controller/controller.go @@ -41,7 +41,6 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apimachinery/pkg/util/uuid" - utilversion "k8s.io/apimachinery/pkg/util/version" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/client-go/informers" "k8s.io/client-go/kubernetes" @@ -53,6 +52,7 @@ import ( "k8s.io/client-go/tools/record" ref "k8s.io/client-go/tools/reference" "k8s.io/client-go/util/workqueue" + utilversion "k8s.io/kubernetes/pkg/util/version" ) // annClass annotation represents the storage class associated with a resource: diff --git a/controller/controller_test.go b/controller/controller_test.go index 42badd8..df1a311 100644 --- a/controller/controller_test.go +++ b/controller/controller_test.go @@ -31,7 +31,6 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/types" utilruntime "k8s.io/apimachinery/pkg/util/runtime" - utilversion "k8s.io/apimachinery/pkg/util/version" "k8s.io/client-go/informers" "k8s.io/client-go/kubernetes" "k8s.io/client-go/kubernetes/fake" @@ -39,6 +38,7 @@ import ( testclient "k8s.io/client-go/testing" "k8s.io/client-go/tools/cache" ref "k8s.io/client-go/tools/reference" + utilversion "k8s.io/kubernetes/pkg/util/version" ) const ( diff --git a/examples/hostpath-provisioner/Gopkg.toml b/examples/hostpath-provisioner/Gopkg.toml index afbe1e7..f492648 100644 --- a/examples/hostpath-provisioner/Gopkg.toml +++ b/examples/hostpath-provisioner/Gopkg.toml @@ -30,19 +30,19 @@ name = "github.com/golang/glog" [[constraint]] - branch = "master" + branch = "release-1.12" name = "github.com/kubernetes-sigs/sig-storage-lib-external-provisioner" [[constraint]] - branch = "master" + branch = "release-1.12" name = "k8s.io/api" [[constraint]] - branch = "master" + branch = "release-1.12" name = "k8s.io/apimachinery" [[constraint]] - branch = "master" + branch = "release-9.0" name = "k8s.io/client-go" [prune] diff --git a/test/e2e/test.sh b/test/e2e/test.sh index bf4efae..5803107 100755 --- a/test/e2e/test.sh +++ b/test/e2e/test.sh @@ -17,7 +17,7 @@ set -x PS4='+\t ' -curl -L https://dl.k8s.io/v1.13.0-alpha.1/kubernetes-server-linux-amd64.tar.gz | tar xz +curl -L https://dl.k8s.io/v1.12.0/kubernetes-server-linux-amd64.tar.gz | tar xz tar xz -f kubernetes/kubernetes-src.tar.gz -C kubernetes kubernetes/hack/install-etcd.sh