Skip to content

Commit 5b9c21b

Browse files
authored
Merge pull request kubernetes-sigs#336 from serathius/upgrade-dependencies
Update all dependencies
2 parents 82ae280 + 0b2100b commit 5b9c21b

File tree

3 files changed

+323
-143
lines changed

3 files changed

+323
-143
lines changed

cmd/metrics-server/app/start.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,10 @@ func (o MetricsServerOptions) Run(stopCh <-chan struct{}) error {
227227
}
228228

229229
// add health checks
230-
server.AddHealthzChecks(healthz.NamedCheck("healthz", mgr.CheckHealth))
230+
err = server.AddHealthChecks(healthz.NamedCheck("healthz", mgr.CheckHealth))
231+
if err != nil {
232+
return err
233+
}
231234

232235
// run everything (the apiserver runs the shared informer factory for us)
233236
mgr.RunUntil(stopCh)

go.mod

Lines changed: 31 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -4,75 +4,46 @@ go 1.12
44

55
require (
66
github.com/NYTimes/gziphandler v1.0.1 // indirect
7-
github.com/PuerkitoBio/purell v1.1.0 // indirect
8-
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
9-
github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973 // indirect
107
github.com/coreos/bbolt v1.3.3 // indirect
11-
github.com/coreos/etcd v3.3.8+incompatible // indirect
12-
github.com/coreos/go-semver v0.3.0 // indirect
13-
github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7 // indirect
8+
github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f // indirect
149
github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f // indirect
15-
github.com/dgrijalva/jwt-go v3.2.0+incompatible // indirect
16-
github.com/emicklei/go-restful v2.8.0+incompatible // indirect
17-
github.com/evanphx/json-patch v4.2.0+incompatible // indirect
18-
github.com/fsnotify/fsnotify v1.4.7 // indirect
19-
github.com/go-openapi/jsonpointer v0.0.0-20180322222829-3a0015ad55fa // indirect
20-
github.com/go-openapi/jsonreference v0.0.0-20180322222742-3fb327e6747d // indirect
21-
github.com/go-openapi/spec v0.0.0-20180415031709-bcff419492ee
22-
github.com/go-openapi/swag v0.0.0-20180405201759-811b1089cde9 // indirect
23-
github.com/gogo/protobuf v1.1.1 // indirect
24-
github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef // indirect
10+
github.com/go-openapi/spec v0.19.2
11+
github.com/gogo/protobuf v1.3.0 // indirect
12+
github.com/golang/groupcache v0.0.0-20191027212112-611e8accdfc9 // indirect
2513
github.com/google/btree v1.0.0 // indirect
26-
github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf // indirect
27-
github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d // indirect
14+
github.com/google/go-cmp v0.3.1 // indirect
2815
github.com/gorilla/websocket v1.4.1 // indirect
29-
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
3016
github.com/grpc-ecosystem/grpc-gateway v1.11.3 // indirect
31-
github.com/hashicorp/golang-lru v0.5.0 // indirect
32-
github.com/hpcloud/tail v1.0.0 // indirect
33-
github.com/imdario/mergo v0.3.5 // indirect
34-
github.com/inconshreveable/mousetrap v1.0.0 // indirect
35-
github.com/jonboulle/clockwork v0.1.0 // indirect
36-
github.com/json-iterator/go v0.0.0-20180701071628-ab8a2e0c74be // indirect
37-
github.com/mailru/easyjson v0.0.0-20180606163543-3fdea8d05856 // indirect
38-
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
39-
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
40-
github.com/modern-go/reflect2 v1.0.1 // indirect
41-
github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d // indirect
42-
github.com/onsi/ginkgo v1.6.0
43-
github.com/onsi/gomega v1.4.0
44-
github.com/pborman/uuid v0.0.0-20170612153648-e790cca94e6c // indirect
45-
github.com/prometheus/client_golang v0.8.0
46-
github.com/prometheus/client_model v0.0.0-20171117100541-99fa1f4be8e5 // indirect
47-
github.com/prometheus/common v0.0.0-20180518154759-7600349dcfe1 // indirect
48-
github.com/prometheus/procfs v0.0.0-20180629160828-40f013a808ec // indirect
49-
github.com/sirupsen/logrus v1.4.2 // indirect
17+
github.com/hashicorp/golang-lru v0.5.3 // indirect
18+
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
19+
github.com/onsi/ginkgo v1.8.0
20+
github.com/onsi/gomega v1.5.0
21+
github.com/pkg/errors v0.8.1 // indirect
22+
github.com/prometheus/client_golang v0.9.2
23+
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4 // indirect
24+
github.com/prometheus/procfs v0.0.0-20190522114515-bc1a522cf7b1 // indirect
5025
github.com/soheilhy/cmux v0.1.4 // indirect
51-
github.com/spf13/cobra v0.0.3
26+
github.com/spf13/cobra v0.0.5
27+
github.com/stretchr/testify v1.4.0 // indirect
5228
github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5 // indirect
53-
github.com/ugorji/go/codec v1.1.7 // indirect
5429
github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 // indirect
5530
go.etcd.io/bbolt v1.3.3 // indirect
56-
golang.org/x/crypto v0.0.0-20180621125126-a49355c7e3f8 // indirect
57-
golang.org/x/net v0.0.0-20190206173232-65e2d4e15006 // indirect
58-
golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a // indirect
59-
golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db // indirect
60-
golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2 // indirect
61-
google.golang.org/appengine v1.5.0 // indirect
62-
gopkg.in/fsnotify.v1 v1.4.7 // indirect
31+
golang.org/x/crypto v0.0.0-20191029031824-8986dd9e96cf // indirect
32+
golang.org/x/net v0.0.0-20191028085509-fe3aa8a45271 // indirect
33+
golang.org/x/sys v0.0.0-20191029155521-f43be2a4598c // indirect
34+
golang.org/x/time v0.0.0-20191024005414-555d28b269f0 // indirect
35+
google.golang.org/appengine v1.6.5 // indirect
36+
google.golang.org/genproto v0.0.0-20191028173616-919d9bdd9fe6 // indirect
37+
google.golang.org/grpc v1.24.0 // indirect
38+
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
6339
gopkg.in/inf.v0 v0.9.1 // indirect
64-
gopkg.in/natefinch/lumberjack.v2 v2.0.0-20170531160350-a96e63847dc3 // indirect
65-
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
66-
k8s.io/api v0.0.0-20190313235455-40a48860b5ab
67-
k8s.io/apimachinery v0.0.0-20191004074956-c5d2f014d689
68-
k8s.io/apiserver v0.0.0-20190313205120-8b27c41bdbb1
69-
k8s.io/client-go v11.0.0+incompatible
70-
k8s.io/component-base v0.0.0-20190409093041-e34633071963
71-
k8s.io/klog v0.2.0
72-
k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30
40+
k8s.io/api v0.0.0-20191016110408-35e52d86657a
41+
k8s.io/apimachinery v0.0.0-20191004115801-a2eda9f80ab8
42+
k8s.io/apiserver v0.0.0-20191016112112-5190913f932d
43+
k8s.io/client-go v0.0.0-20191016111102-bec269661e48
44+
k8s.io/component-base v0.0.0-20191016111319-039242c015a9
45+
k8s.io/klog v0.4.0
46+
k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf
7347
k8s.io/kubernetes v0.0.0-20190409071507-e5a4a92fefbc
74-
k8s.io/metrics v0.0.0-20190314001731-1bd6a4002213
75-
k8s.io/utils v0.0.0-20190308190857-21c4ce38f2a7 // indirect
76-
sigs.k8s.io/structured-merge-diff v0.0.0-20190302045857-e85c7b244fd2 // indirect
77-
sigs.k8s.io/yaml v1.1.0 // indirect
48+
k8s.io/metrics v0.0.0-20191016113814-3b1a734dba6e
7849
)

0 commit comments

Comments
 (0)