Skip to content

Commit 6fc7baa

Browse files
authored
Merge pull request #376 from adracus/feature.kubernetes-1.14
⚠ Bump Kubernetes version to 1.14
2 parents 9d37aab + c8856cc commit 6fc7baa

13 files changed

+289
-137
lines changed

Gopkg.lock

Lines changed: 47 additions & 53 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Gopkg.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,19 +30,19 @@ required = ["sigs.k8s.io/testing_frameworks/integration",
3030

3131
[[constraint]]
3232
name = "k8s.io/api"
33-
version = "kubernetes-1.13.4"
33+
version = "kubernetes-1.14.1"
3434

3535
[[constraint]]
3636
name = "k8s.io/apiextensions-apiserver"
37-
version = "kubernetes-1.13.4"
37+
version = "kubernetes-1.14.1"
3838

3939
[[constraint]]
4040
name = "k8s.io/apimachinery"
41-
version = "kubernetes-1.13.4"
41+
version = "kubernetes-1.14.1"
4242

4343
[[constraint]]
4444
name = "k8s.io/client-go"
45-
version = "kubernetes-1.13.4"
45+
version = "kubernetes-1.14.1"
4646

4747
[[constraint]]
4848
name = "sigs.k8s.io/testing_frameworks"

go.mod

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,27 +7,22 @@ require (
77
github.com/appscode/jsonpatch v0.0.0-20190108182946-7c0e3b262f30
88
github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973 // indirect
99
github.com/evanphx/json-patch v4.1.0+incompatible
10-
github.com/fsnotify/fsnotify v1.4.7 // indirect
1110
github.com/go-logr/logr v0.1.0
1211
github.com/go-logr/zapr v0.1.0
1312
github.com/gogo/protobuf v1.1.1 // indirect
1413
github.com/golang/groupcache v0.0.0-20180513044358-24b0969c4cb7 // indirect
15-
github.com/golang/protobuf v1.2.0 // indirect
16-
github.com/google/btree v1.0.0 // indirect
1714
github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf // indirect
1815
github.com/googleapis/gnostic v0.2.0 // indirect
19-
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
2016
github.com/hashicorp/golang-lru v0.0.0-20180201235237-0fb14efe8c47 // indirect
21-
github.com/hpcloud/tail v1.0.0 // indirect
2217
github.com/imdario/mergo v0.3.6 // indirect
2318
github.com/json-iterator/go v1.1.5 // indirect
19+
github.com/kr/pretty v0.1.0 // indirect
2420
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
2521
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
2622
github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742 // indirect
2723
github.com/onsi/ginkgo v1.6.0
28-
github.com/onsi/gomega v1.4.1
24+
github.com/onsi/gomega v1.4.2
2925
github.com/pborman/uuid v0.0.0-20170612153648-e790cca94e6c // indirect
30-
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
3126
github.com/pkg/errors v0.8.1 // indirect
3227
github.com/prometheus/client_golang v0.9.0
3328
github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910
@@ -38,23 +33,18 @@ require (
3833
go.uber.org/multierr v1.1.0 // indirect
3934
go.uber.org/zap v1.9.1
4035
golang.org/x/crypto v0.0.0-20180820150726-614d502a4dac // indirect
41-
golang.org/x/net v0.0.0-20180821023952-922f4815f713 // indirect
4236
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be // indirect
4337
golang.org/x/sync v0.0.0-20190423024810-112230192c58 // indirect
44-
golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc // indirect
45-
golang.org/x/text v0.3.0 // indirect
4638
golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2 // indirect
4739
google.golang.org/appengine v1.1.0 // indirect
48-
gopkg.in/fsnotify.v1 v1.4.7 // indirect
40+
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect
4941
gopkg.in/inf.v0 v0.9.1 // indirect
50-
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
51-
gopkg.in/yaml.v2 v2.2.1 // indirect
52-
k8s.io/api v0.0.0-20190222213804-5cb15d344471
53-
k8s.io/apiextensions-apiserver v0.0.0-20190228180357-d002e88f6236
54-
k8s.io/apimachinery v0.0.0-20190221213512-86fb29eff628
55-
k8s.io/client-go v0.0.0-20190228174230-b40b2a5939e4
56-
k8s.io/klog v0.1.0 // indirect
42+
k8s.io/api v0.0.0-20190409021203-6e4e0e4f393b
43+
k8s.io/apiextensions-apiserver v0.0.0-20190409022649-727a075fdec8
44+
k8s.io/apimachinery v0.0.0-20190404173353-6a84e37a896d
45+
k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible
5746
k8s.io/kube-openapi v0.0.0-20180731170545-e3762e86a74c // indirect
47+
k8s.io/utils v0.0.0-20190506122338-8fab8cb257d5 // indirect
5848
sigs.k8s.io/testing_frameworks v0.1.1
5949
sigs.k8s.io/yaml v1.1.0
6050
)

0 commit comments

Comments
 (0)