Merge pull request #81173 from logicalhan/shared-metrics

Migrate shared metrics into component base

Kubernetes-commit: fa9e1d2146fbe1c1d876068cab888166b0729194
This commit is contained in:
Kubernetes Publisher 2019-08-22 15:09:29 -07:00
parent fe4e622e64
commit 6f65138f65
3 changed files with 88 additions and 9 deletions

80
Godeps/Godeps.json generated
View File

@ -6,6 +6,34 @@
"./..." "./..."
], ],
"Deps": [ "Deps": [
{
"ImportPath": "cloud.google.com/go",
"Rev": "v0.34.0"
},
{
"ImportPath": "github.com/Azure/go-autorest/autorest",
"Rev": "v0.9.0"
},
{
"ImportPath": "github.com/Azure/go-autorest/autorest/adal",
"Rev": "v0.5.0"
},
{
"ImportPath": "github.com/Azure/go-autorest/autorest/date",
"Rev": "v0.1.0"
},
{
"ImportPath": "github.com/Azure/go-autorest/autorest/mocks",
"Rev": "v0.2.0"
},
{
"ImportPath": "github.com/Azure/go-autorest/logger",
"Rev": "v0.1.0"
},
{
"ImportPath": "github.com/Azure/go-autorest/tracing",
"Rev": "v0.5.0"
},
{ {
"ImportPath": "github.com/NYTimes/gziphandler", "ImportPath": "github.com/NYTimes/gziphandler",
"Rev": "56545f4a5d46" "Rev": "56545f4a5d46"
@ -30,6 +58,10 @@
"ImportPath": "github.com/davecgh/go-spew", "ImportPath": "github.com/davecgh/go-spew",
"Rev": "v1.1.1" "Rev": "v1.1.1"
}, },
{
"ImportPath": "github.com/dgrijalva/jwt-go",
"Rev": "v3.2.0"
},
{ {
"ImportPath": "github.com/docker/spdystream", "ImportPath": "github.com/docker/spdystream",
"Rev": "449fdfce4d96" "Rev": "449fdfce4d96"
@ -86,6 +118,10 @@
"ImportPath": "github.com/golang/protobuf", "ImportPath": "github.com/golang/protobuf",
"Rev": "v1.2.0" "Rev": "v1.2.0"
}, },
{
"ImportPath": "github.com/google/btree",
"Rev": "7d79101e329e"
},
{ {
"ImportPath": "github.com/google/go-cmp", "ImportPath": "github.com/google/go-cmp",
"Rev": "v0.3.0" "Rev": "v0.3.0"
@ -102,6 +138,14 @@
"ImportPath": "github.com/googleapis/gnostic", "ImportPath": "github.com/googleapis/gnostic",
"Rev": "0c5108395e2d" "Rev": "0c5108395e2d"
}, },
{
"ImportPath": "github.com/gophercloud/gophercloud",
"Rev": "v0.1.0"
},
{
"ImportPath": "github.com/gregjones/httpcache",
"Rev": "787624de3eb7"
},
{ {
"ImportPath": "github.com/hashicorp/golang-lru", "ImportPath": "github.com/hashicorp/golang-lru",
"Rev": "v0.5.0" "Rev": "v0.5.0"
@ -110,6 +154,10 @@
"ImportPath": "github.com/hpcloud/tail", "ImportPath": "github.com/hpcloud/tail",
"Rev": "v1.0.0" "Rev": "v1.0.0"
}, },
{
"ImportPath": "github.com/imdario/mergo",
"Rev": "v0.3.5"
},
{ {
"ImportPath": "github.com/json-iterator/go", "ImportPath": "github.com/json-iterator/go",
"Rev": "v1.1.7" "Rev": "v1.1.7"
@ -166,6 +214,10 @@
"ImportPath": "github.com/onsi/gomega", "ImportPath": "github.com/onsi/gomega",
"Rev": "v1.5.0" "Rev": "v1.5.0"
}, },
{
"ImportPath": "github.com/peterbourgon/diskv",
"Rev": "v2.0.1"
},
{ {
"ImportPath": "github.com/pmezard/go-difflib", "ImportPath": "github.com/pmezard/go-difflib",
"Rev": "v1.0.0" "Rev": "v1.0.0"
@ -202,10 +254,18 @@
"ImportPath": "github.com/stretchr/testify", "ImportPath": "github.com/stretchr/testify",
"Rev": "v1.3.0" "Rev": "v1.3.0"
}, },
{
"ImportPath": "golang.org/x/crypto",
"Rev": "e84da0312774"
},
{ {
"ImportPath": "golang.org/x/net", "ImportPath": "golang.org/x/net",
"Rev": "cdfb69ac37fc" "Rev": "cdfb69ac37fc"
}, },
{
"ImportPath": "golang.org/x/oauth2",
"Rev": "9f3314589c9a"
},
{ {
"ImportPath": "golang.org/x/sync", "ImportPath": "golang.org/x/sync",
"Rev": "42b317875d0f" "Rev": "42b317875d0f"
@ -218,10 +278,18 @@
"ImportPath": "golang.org/x/text", "ImportPath": "golang.org/x/text",
"Rev": "e6919f6577db" "Rev": "e6919f6577db"
}, },
{
"ImportPath": "golang.org/x/time",
"Rev": "f51c12702a4d"
},
{ {
"ImportPath": "golang.org/x/tools", "ImportPath": "golang.org/x/tools",
"Rev": "6c7e314b6563" "Rev": "6c7e314b6563"
}, },
{
"ImportPath": "google.golang.org/appengine",
"Rev": "v1.5.0"
},
{ {
"ImportPath": "gopkg.in/check.v1", "ImportPath": "gopkg.in/check.v1",
"Rev": "788fd7840127" "Rev": "788fd7840127"
@ -242,13 +310,21 @@
"ImportPath": "gopkg.in/yaml.v2", "ImportPath": "gopkg.in/yaml.v2",
"Rev": "v2.2.2" "Rev": "v2.2.2"
}, },
{
"ImportPath": "k8s.io/api",
"Rev": "d651a1528133"
},
{ {
"ImportPath": "k8s.io/apimachinery", "ImportPath": "k8s.io/apimachinery",
"Rev": "21ddcbbef9e1" "Rev": "21ff5c96d657"
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "f4e58ce6093c"
}, },
{ {
"ImportPath": "k8s.io/component-base", "ImportPath": "k8s.io/component-base",
"Rev": "1391c9d535ae" "Rev": "e3d4ac5c99fb"
}, },
{ {
"ImportPath": "k8s.io/gengo", "ImportPath": "k8s.io/gengo",

13
go.mod
View File

@ -5,8 +5,8 @@ module k8s.io/kube-controller-manager
go 1.12 go 1.12
require ( require (
k8s.io/apimachinery v0.0.0 k8s.io/apimachinery v0.0.0-20190822212455-21ff5c96d657
k8s.io/component-base v0.0.0 k8s.io/component-base v0.0.0-20190823013255-e3d4ac5c99fb
) )
replace ( replace (
@ -14,9 +14,8 @@ replace (
golang.org/x/sync => golang.org/x/sync v0.0.0-20181108010431-42b317875d0f golang.org/x/sync => golang.org/x/sync v0.0.0-20181108010431-42b317875d0f
golang.org/x/sys => golang.org/x/sys v0.0.0-20190209173611-3b5209105503 golang.org/x/sys => golang.org/x/sys v0.0.0-20190209173611-3b5209105503
golang.org/x/text => golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db golang.org/x/text => golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db
k8s.io/api => ../api k8s.io/api => k8s.io/api v0.0.0-20190820101039-d651a1528133
k8s.io/apimachinery => ../apimachinery k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190822212455-21ff5c96d657
k8s.io/client-go => ../client-go k8s.io/client-go => k8s.io/client-go v0.0.0-20190822053941-f4e58ce6093c
k8s.io/component-base => ../component-base k8s.io/component-base => k8s.io/component-base v0.0.0-20190823013255-e3d4ac5c99fb
k8s.io/kube-controller-manager => ../kube-controller-manager
) )

4
go.sum
View File

@ -119,6 +119,10 @@ gopkg.in/yaml.v2 v2.2.1 h1:mUhvW9EsL+naU5Q3cakzfE91YhliOondGd6ZrsDBHQE=
gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
k8s.io/api v0.0.0-20190820101039-d651a1528133/go.mod h1:AlhL1I0Xqh5Tyz0HsxjEhy+iKci9l1Qy3UMDFW7iG3A=
k8s.io/apimachinery v0.0.0-20190822212455-21ff5c96d657/go.mod h1:EZoIMuAgG/4v58YL+bz0kqnivqupk28fKYxFCa5e6X8=
k8s.io/client-go v0.0.0-20190822053941-f4e58ce6093c/go.mod h1:JQqPsz82IY3YfNQAAJksCCAS8PL9KecFC2CQ4aB60GU=
k8s.io/component-base v0.0.0-20190823013255-e3d4ac5c99fb/go.mod h1:JjVKThITdppqBfoB0Spaj0MZg9uIoTq4VI9VNyW0lqQ=
k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= 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.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=