Merge pull request #92919 from dashpole/update_cadvisor

Update cAdvisor to v0.37.0

Kubernetes-commit: 6b5dc3770851fdc1f356e36fd17810c744181fb1
This commit is contained in:
Kubernetes Publisher 2020-07-12 06:59:55 -07:00
commit 0f6faad16f
3 changed files with 37 additions and 37 deletions

22
Godeps/Godeps.json generated
View File

@ -380,7 +380,7 @@
},
{
"ImportPath": "github.com/json-iterator/go",
"Rev": "v1.1.9"
"Rev": "v1.1.10"
},
{
"ImportPath": "github.com/jstemmer/go-junit-report",
@ -508,7 +508,7 @@
},
{
"ImportPath": "github.com/prometheus/client_golang",
"Rev": "v1.6.0"
"Rev": "v1.7.1"
},
{
"ImportPath": "github.com/prometheus/client_model",
@ -516,11 +516,11 @@
},
{
"ImportPath": "github.com/prometheus/common",
"Rev": "v0.9.1"
"Rev": "v0.10.0"
},
{
"ImportPath": "github.com/prometheus/procfs",
"Rev": "v0.0.11"
"Rev": "v0.1.3"
},
{
"ImportPath": "github.com/prometheus/tsdb",
@ -752,27 +752,27 @@
},
{
"ImportPath": "k8s.io/api",
"Rev": "702e5dfa819c"
"Rev": "be360156aa6a"
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "8e134319f815"
"Rev": "8e7d6bb9bd6d"
},
{
"ImportPath": "k8s.io/cli-runtime",
"Rev": "ceb907b5a95d"
"Rev": "6afecef7a0d3"
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "7fa340820d1c"
"Rev": "505a1f443178"
},
{
"ImportPath": "k8s.io/code-generator",
"Rev": "cf20b2fb095c"
"Rev": "9193f19eab49"
},
{
"ImportPath": "k8s.io/component-base",
"Rev": "d0ef39c660d1"
"Rev": "e98e6e533eb1"
},
{
"ImportPath": "k8s.io/gengo",
@ -788,7 +788,7 @@
},
{
"ImportPath": "k8s.io/metrics",
"Rev": "3aca2203f0fe"
"Rev": "ee44d190271a"
},
{
"ImportPath": "k8s.io/utils",

26
go.mod
View File

@ -34,14 +34,14 @@ require (
github.com/xlab/handysort v0.0.0-20150421192137-fb3537ed64a1 // indirect
golang.org/x/sys v0.0.0-20200622214017-ed371f2e16b4
gopkg.in/yaml.v2 v2.2.8
k8s.io/api v0.0.0-20200711010801-702e5dfa819c
k8s.io/apimachinery v0.0.0-20200711010416-9894919f2c6e
k8s.io/cli-runtime v0.0.0-20200711014701-ceb907b5a95d
k8s.io/client-go v0.0.0-20200712050649-7fa340820d1c
k8s.io/component-base v0.0.0-20200711130808-d0ef39c660d1
k8s.io/api v0.0.0-20200713130235-be360156aa6a
k8s.io/apimachinery v0.0.0-20200713125709-8e7d6bb9bd6d
k8s.io/cli-runtime v0.0.0-20200713140253-6afecef7a0d3
k8s.io/client-go v0.0.0-20200713130841-505a1f443178
k8s.io/component-base v0.0.0-20200713132432-e98e6e533eb1
k8s.io/klog/v2 v2.2.0
k8s.io/kube-openapi v0.0.0-20200427153329-656914f816f9
k8s.io/metrics v0.0.0-20200711014440-3aca2203f0fe
k8s.io/metrics v0.0.0-20200713135919-ee44d190271a
k8s.io/utils v0.0.0-20200619165400-6e3d28b6ed19
sigs.k8s.io/kustomize v2.0.3+incompatible
sigs.k8s.io/yaml v1.2.0
@ -49,11 +49,11 @@ require (
)
replace (
k8s.io/api => k8s.io/api v0.0.0-20200711010801-702e5dfa819c
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200711010416-8e134319f815
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20200711014701-ceb907b5a95d
k8s.io/client-go => k8s.io/client-go v0.0.0-20200712050649-7fa340820d1c
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20200711010124-cf20b2fb095c
k8s.io/component-base => k8s.io/component-base v0.0.0-20200711130808-d0ef39c660d1
k8s.io/metrics => k8s.io/metrics v0.0.0-20200711014440-3aca2203f0fe
k8s.io/api => k8s.io/api v0.0.0-20200713130235-be360156aa6a
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200713125709-8e7d6bb9bd6d
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20200713140253-6afecef7a0d3
k8s.io/client-go => k8s.io/client-go v0.0.0-20200713130841-505a1f443178
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20200713125319-9193f19eab49
k8s.io/component-base => k8s.io/component-base v0.0.0-20200713132432-e98e6e533eb1
k8s.io/metrics => k8s.io/metrics v0.0.0-20200713135919-ee44d190271a
)

26
go.sum
View File

@ -189,8 +189,8 @@ github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANyt
github.com/jonboulle/clockwork v0.1.0 h1:VKV+ZcuP6l3yW9doeqz6ziZGgcynBVQO+obU0+0hcPo=
github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
github.com/json-iterator/go v1.1.9 h1:9yzud/Ht36ygwatGx56VwCZtlI/2AD15T1X2sjSuGns=
github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
github.com/json-iterator/go v1.1.10 h1:Kz6Cvnvv2wGdaG/V8yMvfkmNiXq9Ya2KUv4rouJJr68=
github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
@ -258,7 +258,7 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN
github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso=
github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
github.com/prometheus/client_golang v1.6.0/go.mod h1:ZLOG9ck3JLRdB5MgO8f+lLTe83AXG6ro35rLTxvnIl4=
github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M=
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=
@ -266,11 +266,11 @@ github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6T
github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4=
github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo=
github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
github.com/prometheus/procfs v0.0.11/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
@ -394,7 +394,7 @@ golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7w
golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200420163511-1957bb5e6d1f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200622214017-ed371f2e16b4 h1:5/PjkGUjvEU5Gl6BxmvKRPpqo2uNMv4rcHBMwzk/st8=
golang.org/x/sys v0.0.0-20200622214017-ed371f2e16b4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@ -501,12 +501,12 @@ honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWh
honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
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=
k8s.io/api v0.0.0-20200711010801-702e5dfa819c/go.mod h1:gBMjhq55fktw2TF/h/Ek23P1qoXZyw+GOdvDxMokpqQ=
k8s.io/apimachinery v0.0.0-20200711010416-8e134319f815/go.mod h1:o7dnTWWI581t2mphuLR3towX6xooze3sUXgNRWLd3Cw=
k8s.io/cli-runtime v0.0.0-20200711014701-ceb907b5a95d/go.mod h1:kkAVTM1i6+LhhgqOSwWmRkv2kfeRHjf/a6NB49I+lIE=
k8s.io/client-go v0.0.0-20200712050649-7fa340820d1c/go.mod h1:X2K28IN64vk3UIXTUvqSJWH09vADs40Ivy3/w0T8ppI=
k8s.io/code-generator v0.0.0-20200711010124-cf20b2fb095c/go.mod h1:9w314dZncjv/zcv1Qvm7eXiAW3bh6BgMUrhZSSpdMgM=
k8s.io/component-base v0.0.0-20200711130808-d0ef39c660d1/go.mod h1:xnSvlx0E6AEMnNZozKZ+g3A6EGTWM2y+UAY5Dng9LkI=
k8s.io/api v0.0.0-20200713130235-be360156aa6a/go.mod h1:7a4Es5f8qLSh2S2PUf3gP8NdtZFhLKve7TRsSopUcwU=
k8s.io/apimachinery v0.0.0-20200713125709-8e7d6bb9bd6d/go.mod h1:eHbWZVMaaewmYBAUuRYnAmTTMtDhvpPNZuh8/6Yl7v0=
k8s.io/cli-runtime v0.0.0-20200713140253-6afecef7a0d3/go.mod h1:Hiuu5z8I9GbOG87Lirg0yF5Qa617/HXJAbuwcahd8Bo=
k8s.io/client-go v0.0.0-20200713130841-505a1f443178/go.mod h1:4DeUSdsqcLMsCjohGuc0/AzpQDCDYsgjd7oq0vlmFQY=
k8s.io/code-generator v0.0.0-20200713125319-9193f19eab49/go.mod h1:uR3gwQvtcOjBrvwXhFF1lw5kq9BOOAfSKl/pZZ1zW3I=
k8s.io/component-base v0.0.0-20200713132432-e98e6e533eb1/go.mod h1:vP8oeTBkmx6vS0b48FQ1masOyJvdltkTeuaV28yaF8k=
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/gengo v0.0.0-20200428234225-8167cfdcfc14/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
@ -514,7 +514,7 @@ k8s.io/klog/v2 v2.2.0 h1:XRvcwJozkgZ1UQJmfMGpvRthQHOvihEhYtDfAaxMz/A=
k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=
k8s.io/kube-openapi v0.0.0-20200427153329-656914f816f9 h1:5NC2ITmvg8RoxoH0wgmL4zn4VZqXGsKbxrikjaQx6s4=
k8s.io/kube-openapi v0.0.0-20200427153329-656914f816f9/go.mod h1:bfCVj+qXcEaE5SCvzBaqpOySr6tuCcpPKqF6HD8nyCw=
k8s.io/metrics v0.0.0-20200711014440-3aca2203f0fe/go.mod h1:qWdn/GQ0Rj2nwvjBWJf4To8dBKn8l6+lalQQ2dj2lkg=
k8s.io/metrics v0.0.0-20200713135919-ee44d190271a/go.mod h1:EUkmg4D3Bwa4XyQp56z0CJg/dXsWVhJud5uWPnSlcKY=
k8s.io/utils v0.0.0-20200619165400-6e3d28b6ed19 h1:7Nu2dTj82c6IaWvL7hImJzcXoTPz1MsSCH7r+0m6rfo=
k8s.io/utils v0.0.0-20200619165400-6e3d28b6ed19/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=