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 2b4994b5a0
commit ad8882429e
3 changed files with 47 additions and 25 deletions

26
Godeps/Godeps.json generated
View File

@ -100,7 +100,7 @@
},
{
"ImportPath": "github.com/alecthomas/units",
"Rev": "c3de453c63f4"
"Rev": "f65c72e2690d"
},
{
"ImportPath": "github.com/armon/circbuf",
@ -286,9 +286,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",
@ -490,6 +494,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"
@ -504,7 +512,7 @@
},
{
"ImportPath": "github.com/julienschmidt/httprouter",
"Rev": "v1.2.0"
"Rev": "v1.3.0"
},
{
"ImportPath": "github.com/kisielk/errcheck",
@ -516,7 +524,7 @@
},
{
"ImportPath": "github.com/konsorten/go-windows-terminal-sequences",
"Rev": "v1.0.1"
"Rev": "v1.0.3"
},
{
"ImportPath": "github.com/kr/logfmt",
@ -624,7 +632,7 @@
},
{
"ImportPath": "github.com/mwitkow/go-conntrack",
"Rev": "cc309e4a2223"
"Rev": "2f068394615f"
},
{
"ImportPath": "github.com/mxk/go-flowrate",
@ -692,7 +700,7 @@
},
{
"ImportPath": "github.com/prometheus/common",
"Rev": "v0.10.0"
"Rev": "v0.26.0"
},
{
"ImportPath": "github.com/prometheus/procfs",
@ -736,7 +744,7 @@
},
{
"ImportPath": "github.com/sirupsen/logrus",
"Rev": "v1.4.2"
"Rev": "v1.6.0"
},
{
"ImportPath": "github.com/smartystreets/assertions",
@ -984,7 +992,7 @@
},
{
"ImportPath": "k8s.io/cli-runtime",
"Rev": "6ac34f0f28df"
"Rev": "0c839ec07fe7"
},
{
"ImportPath": "k8s.io/client-go",
@ -996,7 +1004,7 @@
},
{
"ImportPath": "k8s.io/component-base",
"Rev": "4ceecfef9988"
"Rev": "a099a26853cb"
},
{
"ImportPath": "k8s.io/component-helpers",

31
go.mod
View File

@ -31,15 +31,15 @@ require (
github.com/stretchr/testify v1.7.0
golang.org/x/sys v0.0.0-20210426230700-d19ff857e887
gopkg.in/yaml.v2 v2.4.0
k8s.io/api v0.0.0
k8s.io/apimachinery v0.0.0
k8s.io/cli-runtime v0.0.0
k8s.io/client-go v0.0.0
k8s.io/component-base v0.0.0
k8s.io/component-helpers v0.0.0
k8s.io/api v0.0.0-20210601194609-0b55fc9ab6bb
k8s.io/apimachinery v0.0.0-20210601194424-1e82f3b632c6
k8s.io/cli-runtime v0.0.0-20210603160237-0c839ec07fe7
k8s.io/client-go v0.0.0-20210602034813-09dbda0b387f
k8s.io/component-base v0.0.0-20210603154938-a099a26853cb
k8s.io/component-helpers v0.0.0-20210601195503-8f7f89d23351
k8s.io/klog/v2 v2.9.0
k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e
k8s.io/metrics v0.0.0
k8s.io/metrics v0.0.0-20210601200700-45ac72778a18
k8s.io/utils v0.0.0-20201110183641-67b214c5f920
sigs.k8s.io/kustomize/api v0.8.10
sigs.k8s.io/kustomize/kustomize/v4 v4.1.3
@ -47,13 +47,12 @@ require (
)
replace (
k8s.io/api => ../api
k8s.io/apimachinery => ../apimachinery
k8s.io/cli-runtime => ../cli-runtime
k8s.io/client-go => ../client-go
k8s.io/code-generator => ../code-generator
k8s.io/component-base => ../component-base
k8s.io/component-helpers => ../component-helpers
k8s.io/kubectl => ../kubectl
k8s.io/metrics => ../metrics
k8s.io/api => k8s.io/api v0.0.0-20210601194609-0b55fc9ab6bb
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210601194424-1e82f3b632c6
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20210603160237-0c839ec07fe7
k8s.io/client-go => k8s.io/client-go v0.0.0-20210602034813-09dbda0b387f
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20210601194243-9c11f9272960
k8s.io/component-base => k8s.io/component-base v0.0.0-20210603154938-a099a26853cb
k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20210601195503-8f7f89d23351
k8s.io/metrics => k8s.io/metrics v0.0.0-20210601200700-45ac72778a18
)

15
go.sum
View File

@ -681,6 +681,19 @@ honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWh
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
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/cli-runtime v0.0.0-20210603160237-0c839ec07fe7 h1:ZPV5Q1S7ZjxZuLAiHDScRO3HSd8uOXZa4B5AaLgt9Ks=
k8s.io/cli-runtime v0.0.0-20210603160237-0c839ec07fe7/go.mod h1:R1Rgl7+KWpgWNNw8QCXl+YxFAkFORy5IRYAoe50hHVc=
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/code-generator v0.0.0-20210601194243-9c11f9272960/go.mod h1:FSpIt1knsWe0QNfwrAq7+M1/AhwWXHWKjsbbfeeW+N4=
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/component-helpers v0.0.0-20210601195503-8f7f89d23351 h1:i/wOY9aOgmKPSX59t/3M5b5esQ5r0c/qZ3ZW9u1ZUAk=
k8s.io/component-helpers v0.0.0-20210601195503-8f7f89d23351/go.mod h1:TedBw/3NOkOWassHrHrls3d1SwTbLFohyHrSYV4EH+M=
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
@ -689,6 +702,8 @@ k8s.io/klog/v2 v2.9.0 h1:D7HV+n1V57XeZ0m6tdRkfknthUaM06VFbWldOFh8kzM=
k8s.io/klog/v2 v2.9.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec=
k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e h1:KLHHjkdQFomZy8+06csTWZ0m1343QqxZhR2LJ1OxCYM=
k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e/go.mod h1:vHXdDvt9+2spS2Rx9ql3I8tycm3H9FDfdUoIuKCefvw=
k8s.io/metrics v0.0.0-20210601200700-45ac72778a18 h1:DzV0xOpeGRbKgKNlZOdeCr+OlLWdQosqfMTh8Ra0Iy4=
k8s.io/metrics v0.0.0-20210601200700-45ac72778a18/go.mod h1:7qcV/ZlApXTcxkqPy2myNcLoOesXz+yQg0/s3B6lzis=
k8s.io/utils v0.0.0-20201110183641-67b214c5f920 h1:CbnUZsM497iRC5QMVkHwyl8s2tB3g7yaSHkYPkpgelw=
k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=