Skip to content
This repository was archived by the owner on Oct 21, 2020. It is now read-only.

Commit a36eb11

Browse files
authored
Merge pull request #1025 from dims/update-dependencies-to-kubernetes-v1.13.0-alpha.1
Update dependencies to kubernetes v1.13.0-alpha.1
2 parents e3b7353 + 85539e4 commit a36eb11

File tree

257 files changed

+6521
-16699
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

257 files changed

+6521
-16699
lines changed

Gopkg.lock

+25-58
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Gopkg.toml

+5-5
Original file line numberDiff line numberDiff line change
@@ -64,23 +64,23 @@ ignored = [
6464

6565
[[constraint]]
6666
name = "k8s.io/api"
67-
version = "kubernetes-1.12.0"
67+
version = "kubernetes-1.13.0-alpha.1"
6868

6969
[[constraint]]
7070
name = "k8s.io/apiextensions-apiserver"
71-
version = "kubernetes-1.12.0"
71+
version = "kubernetes-1.13.0-alpha.1"
7272

7373
[[constraint]]
7474
name = "k8s.io/apimachinery"
75-
version = "kubernetes-1.12.0"
75+
version = "kubernetes-1.13.0-alpha.1"
7676

7777
[[constraint]]
7878
name = "k8s.io/client-go"
79-
version = "kubernetes-1.12.0"
79+
version = "kubernetes-1.13.0-alpha.1"
8080

8181
[[constraint]]
8282
name = "k8s.io/kubernetes"
83-
version = "v1.12.0"
83+
version = "v1.13.0-alpha.1"
8484

8585
# https://github.com/kubernetes/kubernetes/blob/v1.12.0-beta.1/Godeps/Godeps.json#L3213
8686
[[override]]

lib/controller/controller.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ import (
4141
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
4242
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
4343
"k8s.io/apimachinery/pkg/util/uuid"
44+
utilversion "k8s.io/apimachinery/pkg/util/version"
4445
"k8s.io/apimachinery/pkg/util/wait"
4546
"k8s.io/client-go/informers"
4647
"k8s.io/client-go/kubernetes"
@@ -53,7 +54,6 @@ import (
5354
ref "k8s.io/client-go/tools/reference"
5455
"k8s.io/client-go/util/workqueue"
5556
"k8s.io/kubernetes/pkg/apis/core/v1/helper"
56-
utilversion "k8s.io/kubernetes/pkg/util/version"
5757
)
5858

5959
// annClass annotation represents the storage class associated with a resource:

lib/controller/controller_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,14 @@ import (
3131
"k8s.io/apimachinery/pkg/runtime"
3232
"k8s.io/apimachinery/pkg/types"
3333
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
34+
utilversion "k8s.io/apimachinery/pkg/util/version"
3435
"k8s.io/client-go/informers"
3536
"k8s.io/client-go/kubernetes"
3637
"k8s.io/client-go/kubernetes/fake"
3738
"k8s.io/client-go/kubernetes/scheme"
3839
testclient "k8s.io/client-go/testing"
3940
"k8s.io/client-go/tools/cache"
4041
ref "k8s.io/client-go/tools/reference"
41-
utilversion "k8s.io/kubernetes/pkg/util/version"
4242
)
4343

4444
const (

0 commit comments

Comments
 (0)