Merge pull request #1025 from dims/update-dependencies-to-kubernetes-…

…v1.13.0-alpha.1 Update dependencies to kubernetes v1.13.0-alpha.1
kubernetes-retired · Oct 16, 2018 · a36eb11 · a36eb11
2 parents e3b7353 + 85539e4
commit a36eb11
Show file tree

Hide file tree

Showing 257 changed files with 6,521 additions and 16,699 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -64,23 +64,23 @@ ignored = [
 
 [[constraint]]
   name = "k8s.io/api"
-  version = "kubernetes-1.12.0"
+  version = "kubernetes-1.13.0-alpha.1"
 
 [[constraint]]
   name = "k8s.io/apiextensions-apiserver"
-  version = "kubernetes-1.12.0"
+  version = "kubernetes-1.13.0-alpha.1"
 
 [[constraint]]
   name = "k8s.io/apimachinery"
-  version = "kubernetes-1.12.0"
+  version = "kubernetes-1.13.0-alpha.1"
 
 [[constraint]]
   name = "k8s.io/client-go"
-  version = "kubernetes-1.12.0"
+  version = "kubernetes-1.13.0-alpha.1"
 
 [[constraint]]
   name = "k8s.io/kubernetes"
-  version = "v1.12.0"
+  version = "v1.13.0-alpha.1"
 
 # https://github.com/kubernetes/kubernetes/blob/v1.12.0-beta.1/Godeps/Godeps.json#L3213
 [[override]]

diff --git a/lib/controller/controller.go b/lib/controller/controller.go
@@ -41,6 +41,7 @@ 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,7 +54,6 @@ import (
 	ref "k8s.io/client-go/tools/reference"
 	"k8s.io/client-go/util/workqueue"
 	"k8s.io/kubernetes/pkg/apis/core/v1/helper"
-	utilversion "k8s.io/kubernetes/pkg/util/version"
 )
 
 // annClass annotation represents the storage class associated with a resource:

diff --git a/lib/controller/controller_test.go b/lib/controller/controller_test.go
@@ -31,14 +31,14 @@ 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"
 	"k8s.io/client-go/kubernetes/scheme"
 	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 (