kubernetes
/
apiserver
mirror of https://github.com/kubernetes/apiserver.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #102561 from dims/updating-to-prometheus/common-latest-version 

Updating to prometheus/common v0.26.0

Kubernetes-commit: 96436fa0e7594aa22eafcd56fcbae759965c1df7
This commit is contained in:
Kubernetes Publisher 2021-06-03 07:05:38 -07:00
parent 83b1fbbd72
commit 7dc5d986bb
3 changed files with 31 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Godeps/Godeps.json generated
View File

@ -96,7 +96,7 @@
},
{
"ImportPath": "github.com/alecthomas/units",
"Rev": "c3de453c63f4"
"Rev": "f65c72e2690d"
},
{
"ImportPath": "github.com/armon/circbuf",
@ -262,9 +262,13 @@
"ImportPath": "github.com/go-kit/kit",
"Rev": "v0.9.0"
},
{
"ImportPath": "github.com/go-kit/log",
"Rev": "v0.1.0"
},
{
"ImportPath": "github.com/go-logfmt/logfmt",
"Rev": "v0.4.0"
"Rev": "v0.5.0"
},
{
"ImportPath": "github.com/go-logr/logr",
@ -458,6 +462,10 @@
"ImportPath": "github.com/jonboulle/clockwork",
"Rev": "v0.1.0"
},
{
"ImportPath": "github.com/jpillora/backoff",
"Rev": "v1.0.0"
},
{
"ImportPath": "github.com/json-iterator/go",
"Rev": "v1.1.10"
@ -472,7 +480,7 @@
},
{
"ImportPath": "github.com/julienschmidt/httprouter",
"Rev": "v1.2.0"
"Rev": "v1.3.0"
},
{
"ImportPath": "github.com/kisielk/errcheck",
@ -484,7 +492,7 @@
},
{
"ImportPath": "github.com/konsorten/go-windows-terminal-sequences",
"Rev": "v1.0.1"
"Rev": "v1.0.3"
},
{
"ImportPath": "github.com/kr/logfmt",
@ -576,7 +584,7 @@
},
{
"ImportPath": "github.com/mwitkow/go-conntrack",
"Rev": "cc309e4a2223"
"Rev": "2f068394615f"
},
{
"ImportPath": "github.com/mxk/go-flowrate",
@ -644,7 +652,7 @@
},
{
"ImportPath": "github.com/prometheus/common",
"Rev": "v0.10.0"
"Rev": "v0.26.0"
},
{
"ImportPath": "github.com/prometheus/procfs",
@ -936,7 +944,7 @@
},
{
"ImportPath": "k8s.io/component-base",
"Rev": "4ceecfef9988"
"Rev": "a099a26853cb"
},
{
"ImportPath": "k8s.io/gengo",

17
go.mod
View File

@ -38,10 +38,10 @@ require (
google.golang.org/grpc v1.27.1
gopkg.in/natefinch/lumberjack.v2 v2.0.0
gopkg.in/square/go-jose.v2 v2.2.2
k8s.io/api v0.0.0
k8s.io/apimachinery v0.0.0
k8s.io/client-go v0.0.0
k8s.io/component-base v0.0.0
k8s.io/api v0.0.0-20210601194609-0b55fc9ab6bb
k8s.io/apimachinery v0.0.0-20210601194424-1e82f3b632c6
k8s.io/client-go v0.0.0-20210602034813-09dbda0b387f
k8s.io/component-base v0.0.0-20210603154938-a099a26853cb
k8s.io/klog/v2 v2.9.0
k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e
k8s.io/utils v0.0.0-20201110183641-67b214c5f920
@ -51,9 +51,8 @@ require (
)
replace (
k8s.io/api => ../api
k8s.io/apimachinery => ../apimachinery
k8s.io/apiserver => ../apiserver
k8s.io/client-go => ../client-go
k8s.io/component-base => ../component-base
k8s.io/api => k8s.io/api v0.0.0-20210601194609-0b55fc9ab6bb
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210601194424-1e82f3b632c6
k8s.io/client-go => k8s.io/client-go v0.0.0-20210602034813-09dbda0b387f
k8s.io/component-base => k8s.io/component-base v0.0.0-20210603154938-a099a26853cb
)

8
go.sum
View File

@ -695,6 +695,14 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
honnef.co/go/tools v0.0.1-2020.1.3 h1:sXmLre5bzIR6ypkjXCDI3jHPssRhc8KD/Ome589sc3U=
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
k8s.io/api v0.0.0-20210601194609-0b55fc9ab6bb h1:bjPb0/AjLmHbYb+sYorOHImcVSqA+dMsHqYjPbfBmNQ=
k8s.io/api v0.0.0-20210601194609-0b55fc9ab6bb/go.mod h1:G/aFk75uPvZtPzIzRb9OjwlDQCp9fVTsMnh1+PICcQc=
k8s.io/apimachinery v0.0.0-20210601194424-1e82f3b632c6 h1:35RqwIXLWAA4pK39d4FVRKnexm0pPua15G2Aos6hFeg=
k8s.io/apimachinery v0.0.0-20210601194424-1e82f3b632c6/go.mod h1:+4qqXWg4CfY9knLAQ+WV7EjNplTpQ0Ima2Q27TU3u+c=
k8s.io/client-go v0.0.0-20210602034813-09dbda0b387f h1:EMw9ViGOUCZwbQJ0I0rA+zZ3Eg4c30nbxV+HmrLH+No=
k8s.io/client-go v0.0.0-20210602034813-09dbda0b387f/go.mod h1:bUYhQAQPUTfTS7ozpIcUUF1OTXYj5DKVSOnL19dWl10=
k8s.io/component-base v0.0.0-20210603154938-a099a26853cb h1:FyISMbSyWuB8DF9cBsNbnHfqddL+Tb56VUHHQYWzsN0=
k8s.io/component-base v0.0.0-20210603154938-a099a26853cb/go.mod h1:HdCRswmINRqx1a+Xg+d7WRwVC0dTz1KWletenZ/gqiU=
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
k8s.io/klog/v2 v2.9.0 h1:D7HV+n1V57XeZ0m6tdRkfknthUaM06VFbWldOFh8kzM=