Skip to content

Commit 4ba0a3b

Browse files
authored
Merge pull request #599 from joelanford/k8s-1.15.3
✨ Bump dependencies for Kubernetes 1.15.4
2 parents aac8bc7 + 3738249 commit 4ba0a3b

File tree

6 files changed

+203
-72
lines changed

6 files changed

+203
-72
lines changed

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Please see https://git.k8s.io/community/CLA.md for more info
1818

1919
1. Setup tools
2020
```bash
21-
$ curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(go env GOPATH)/bin v1.15.0
21+
$ curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(go env GOPATH)/bin v1.17.1
2222
```
2323
1. Test
2424
```bash

go.mod

Lines changed: 9 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,34 @@
11
module sigs.k8s.io/controller-runtime
22

3-
go 1.11
3+
go 1.12
44

55
require (
6-
cloud.google.com/go v0.26.0 // indirect
7-
github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973 // indirect
86
github.com/evanphx/json-patch v4.5.0+incompatible
97
github.com/go-logr/logr v0.1.0
108
github.com/go-logr/zapr v0.1.0
11-
github.com/gogo/protobuf v1.1.1 // indirect
129
github.com/golang/groupcache v0.0.0-20180513044358-24b0969c4cb7 // indirect
13-
github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf // indirect
1410
github.com/googleapis/gnostic v0.3.1 // indirect
15-
github.com/hashicorp/golang-lru v0.0.0-20180201235237-0fb14efe8c47 // indirect
1611
github.com/imdario/mergo v0.3.6 // indirect
17-
github.com/json-iterator/go v1.1.5 // indirect
1812
github.com/kr/pretty v0.1.0 // indirect
19-
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
20-
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
21-
github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742 // indirect
2213
github.com/onsi/ginkgo v1.6.0
2314
github.com/onsi/gomega v1.4.2
24-
github.com/pborman/uuid v0.0.0-20170612153648-e790cca94e6c // indirect
25-
github.com/prometheus/client_golang v0.9.0
26-
github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910
27-
github.com/prometheus/common v0.0.0-20180801064454-c7de2306084e // indirect
28-
github.com/prometheus/procfs v0.0.0-20180725123919-05ee40e3a273 // indirect
15+
github.com/prometheus/client_golang v1.0.0
16+
github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90
2917
github.com/spf13/pflag v1.0.2 // indirect
3018
go.uber.org/atomic v1.3.2 // indirect
3119
go.uber.org/multierr v1.1.0 // indirect
3220
go.uber.org/zap v1.9.1
33-
golang.org/x/crypto v0.0.0-20180820150726-614d502a4dac // indirect
34-
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be // indirect
35-
golang.org/x/sync v0.0.0-20190423024810-112230192c58 // indirect
21+
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 // indirect
3622
golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2 // indirect
3723
gomodules.xyz/jsonpatch/v2 v2.0.1
38-
google.golang.org/appengine v1.1.0 // indirect
3924
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect
4025
gopkg.in/fsnotify.v1 v1.4.7
4126
gopkg.in/inf.v0 v0.9.1 // 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
46-
k8s.io/kube-openapi v0.0.0-20180731170545-e3762e86a74c // indirect
27+
k8s.io/api v0.0.0-20190918195907-bd6ac527cfd2
28+
k8s.io/apiextensions-apiserver v0.0.0-20190918201827-3de75813f604
29+
k8s.io/apimachinery v0.0.0-20190817020851-f2f3a405f61d
30+
k8s.io/client-go v0.0.0-20190918200256-06eb1244587a
31+
k8s.io/klog v0.3.3 // indirect
4732
k8s.io/utils v0.0.0-20190506122338-8fab8cb257d5
4833
sigs.k8s.io/testing_frameworks v0.1.1
4934
sigs.k8s.io/yaml v1.1.0

0 commit comments

Comments
 (0)