Merge pull request #87517 from odinuge/prom-client_model

Bump dependency github.com/prometheus/client_model@v0.2.0

Kubernetes-commit: 608ac4e67d2f6991553a6812a7cbe26beb5250f8
This commit is contained in:
Kubernetes Publisher 2020-01-30 16:59:12 -08:00
commit 0dd665ea25
3 changed files with 10 additions and 10 deletions

6
Godeps/Godeps.json generated
View file

@ -408,7 +408,7 @@
},
{
"ImportPath": "github.com/prometheus/client_model",
"Rev": "14fe0d1b01d4"
"Rev": "v0.2.0"
},
{
"ImportPath": "github.com/prometheus/common",
@ -572,7 +572,7 @@
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "eb4ad4570127"
"Rev": "f30c02351710"
},
{
"ImportPath": "k8s.io/cli-runtime",
@ -588,7 +588,7 @@
},
{
"ImportPath": "k8s.io/component-base",
"Rev": "c1abf0189091"
"Rev": "6bcd25baa4f4"
},
{
"ImportPath": "k8s.io/gengo",

8
go.mod
View file

@ -37,10 +37,10 @@ require (
gopkg.in/yaml.v2 v2.2.8
gotest.tools v2.2.0+incompatible // indirect
k8s.io/api v0.0.0-20200130072251-812149543c99
k8s.io/apimachinery v0.0.0-20200130072111-eb4ad4570127
k8s.io/apimachinery v0.0.0-20200131032148-f30c02351710
k8s.io/cli-runtime v0.0.0-20200130074326-5f85d948d02a
k8s.io/client-go v0.0.0-20200130072523-1ae532aad6ad
k8s.io/component-base v0.0.0-20200130073007-c1abf0189091
k8s.io/component-base v0.0.0-20200131033216-6bcd25baa4f4
k8s.io/klog v1.0.0
k8s.io/kube-openapi v0.0.0-20200121204235-bf4fb3bd569c
k8s.io/metrics v0.0.0-20200130074207-b9a3a75a094d
@ -54,10 +54,10 @@ replace (
golang.org/x/sys => golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a // pinned to release-branch.go1.13
golang.org/x/tools => golang.org/x/tools v0.0.0-20190821162956-65e3620a7ae7 // pinned to release-branch.go1.13
k8s.io/api => k8s.io/api v0.0.0-20200130072251-812149543c99
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200130072111-eb4ad4570127
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200131032148-f30c02351710
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20200130074326-5f85d948d02a
k8s.io/client-go => k8s.io/client-go v0.0.0-20200130072523-1ae532aad6ad
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20200130061103-7dfd5e9157ef
k8s.io/component-base => k8s.io/component-base v0.0.0-20200130073007-c1abf0189091
k8s.io/component-base => k8s.io/component-base v0.0.0-20200131033216-6bcd25baa4f4
k8s.io/metrics => k8s.io/metrics v0.0.0-20200130074207-b9a3a75a094d
)

6
go.sum
View file

@ -203,7 +203,7 @@ github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXP
github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
@ -313,11 +313,11 @@ gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
k8s.io/api v0.0.0-20200130072251-812149543c99/go.mod h1:5hz1MDQLlgYnKttI81z5nZ8LGQtHE6oI6Ry3XcXnVAI=
k8s.io/apimachinery v0.0.0-20200130072111-eb4ad4570127/go.mod h1:f7PPp70QzCGGLJHvCtiN2lePa9CdVddeAdL5w7NdrrU=
k8s.io/apimachinery v0.0.0-20200131032148-f30c02351710/go.mod h1:f7PPp70QzCGGLJHvCtiN2lePa9CdVddeAdL5w7NdrrU=
k8s.io/cli-runtime v0.0.0-20200130074326-5f85d948d02a/go.mod h1:EvC9smXittI0hZcgIg9bwyNn8jYt/yKh89vxN6KyBOc=
k8s.io/client-go v0.0.0-20200130072523-1ae532aad6ad/go.mod h1:1IzWcSqMJwg2THGQsF6Bbx340lRBq6vB2zHCzcnavlo=
k8s.io/code-generator v0.0.0-20200130061103-7dfd5e9157ef/go.mod h1:NAaJDQco+Cl4r3iPb/hSe4nHkLV7qLo851pX3qtK/Hs=
k8s.io/component-base v0.0.0-20200130073007-c1abf0189091/go.mod h1:HzmjRJW6Bp7Gk7CjqmoXwm53pONGbanJQz54pUAyLtc=
k8s.io/component-base v0.0.0-20200131033216-6bcd25baa4f4/go.mod h1:3ihYk7gL8sAstCXPeoTf9MQ5V54QbAC5KWTNVAkDJjY=
k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/gengo v0.0.0-20200114144118-36b2048a9120/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=