Merge pull request #87093 from dims/update-prometheus/client_model-to-v0.1.0

Move from random SHA - update github.com/prometheus/client_model to v0.1.0

Kubernetes-commit: 5ade844b7245523c9c3a5467f4c03a6fe75ada23
This commit is contained in:
Kubernetes Publisher 2020-01-11 02:44:02 -08:00
parent ea1b97e8b8
commit d654294643
3 changed files with 15 additions and 12 deletions

10
Godeps/Godeps.json generated
View File

@ -300,7 +300,7 @@
},
{
"ImportPath": "github.com/prometheus/client_model",
"Rev": "fd36f4220a90"
"Rev": "v0.1.0"
},
{
"ImportPath": "github.com/prometheus/common",
@ -424,19 +424,19 @@
},
{
"ImportPath": "k8s.io/api",
"Rev": "72223a9f9901"
"Rev": "7dc09db16fb8"
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "3253b0a30d67"
"Rev": "904d3d8a3999"
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "1b1a35e41a57"
"Rev": "8ead54f5cff8"
},
{
"ImportPath": "k8s.io/component-base",
"Rev": "a6e74ff2e316"
"Rev": "313033959c60"
},
{
"ImportPath": "k8s.io/gengo",

13
go.mod
View File

@ -5,16 +5,15 @@ module k8s.io/kube-controller-manager
go 1.13
require (
k8s.io/apimachinery v0.0.0
k8s.io/component-base v0.0.0
k8s.io/apimachinery v0.0.0-20200109233455-904d3d8a3999
k8s.io/component-base v0.0.0-20200111113959-313033959c60
)
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 => ../api
k8s.io/apimachinery => ../apimachinery
k8s.io/client-go => ../client-go
k8s.io/component-base => ../component-base
k8s.io/kube-controller-manager => ../kube-controller-manager
k8s.io/api => k8s.io/api v0.0.0-20191230033939-7dc09db16fb8
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200109233455-904d3d8a3999
k8s.io/client-go => k8s.io/client-go v0.0.0-20200107234521-8ead54f5cff8
k8s.io/component-base => k8s.io/component-base v0.0.0-20200111113959-313033959c60
)

4
go.sum
View File

@ -189,6 +189,10 @@ gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I=
gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
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-20191230033939-7dc09db16fb8/go.mod h1:cUvsxRRcutO57eFbvcbKsHasCbJP9NF8JA7Q9icijjI=
k8s.io/apimachinery v0.0.0-20200109233455-904d3d8a3999/go.mod h1:f763v4YxJPg8tVQiktAorc+M5Ot35n9qV7zC0bCzr0s=
k8s.io/client-go v0.0.0-20200107234521-8ead54f5cff8/go.mod h1:XbyVlvmKhF4X6DevVvGCklm1/5RaVa+NltG4Oh89Aeo=
k8s.io/component-base v0.0.0-20200111113959-313033959c60/go.mod h1:qjoqc/n6GTvEsfG6JidbPN3C6qFCbg2xebZICu36gYw=
k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=