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

Merge pull request #100739 from pacoxu/update-zap 

update uber zap to 1.16.0 to fix a nil pointer exception

Kubernetes-commit: 0b0727b563502e45802e2fc4536b2c6734781261
This commit is contained in:
Kubernetes Publisher 2021-04-11 16:19:59 -07:00
parent ddf04e311e 87cb53e47f
commit 85d3f2c068
3 changed files with 39 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Godeps/Godeps.json generated
View File

@ -764,15 +764,19 @@
},
{
"ImportPath": "go.uber.org/atomic",
"Rev": "v1.4.0"
"Rev": "v1.6.0"
},
{
"ImportPath": "go.uber.org/multierr",
"Rev": "v1.1.0"
"Rev": "v1.5.0"
},
{
"ImportPath": "go.uber.org/tools",
"Rev": "2cfd321de3ee"
},
{
"ImportPath": "go.uber.org/zap",
"Rev": "v1.10.0"
"Rev": "v1.16.0"
},
{
"ImportPath": "golang.org/x/crypto",
@ -796,7 +800,7 @@
},
{
"ImportPath": "golang.org/x/mod",
"Rev": "v0.3.0"
"Rev": "ce943fd02449"
},
{
"ImportPath": "golang.org/x/net",
@ -828,7 +832,7 @@
},
{
"ImportPath": "golang.org/x/tools",
"Rev": "113979e3529a"
"Rev": "v0.1.0"
},
{
"ImportPath": "golang.org/x/xerrors",
@ -920,27 +924,27 @@
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "d8cdd62f18c3"
"Rev": "d23dd757f6df"
},
{
"ImportPath": "k8s.io/apiserver",
"Rev": "cba9cd88c4ae"
"Rev": "c5d971fadc40"
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "0bb6464b1348"
"Rev": "0cfeb7fda9de"
},
{
"ImportPath": "k8s.io/cloud-provider",
"Rev": "6c4b94e92b1e"
"Rev": "da4287c2bc54"
},
{
"ImportPath": "k8s.io/component-base",
"Rev": "18d65a503ea1"
"Rev": "a57cc3fac704"
},
{
"ImportPath": "k8s.io/controller-manager",
"Rev": "a7c712bd6b9e"
"Rev": "41b09a398481"
},
{
"ImportPath": "k8s.io/gengo",

18
go.mod
View File

@ -5,17 +5,17 @@ module k8s.io/kube-controller-manager
go 1.16
require (
k8s.io/apimachinery v0.0.0-20210411031630-d8cdd62f18c3
k8s.io/cloud-provider v0.0.0-20210411034841-6c4b94e92b1e
k8s.io/controller-manager v0.0.0-20210411034739-a7c712bd6b9e
k8s.io/apimachinery v0.0.0-20210411071641-d23dd757f6df
k8s.io/cloud-provider v0.0.0-20210412040536-da4287c2bc54
k8s.io/controller-manager v0.0.0-20210412040347-41b09a398481
)
replace (
k8s.io/api => k8s.io/api v0.0.0-20210411031832-6eed676bc189
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210411031630-d8cdd62f18c3
k8s.io/apiserver => k8s.io/apiserver v0.0.0-20210411033040-cba9cd88c4ae
k8s.io/client-go => k8s.io/client-go v0.0.0-20210411032117-0bb6464b1348
k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20210411034841-6c4b94e92b1e
k8s.io/component-base => k8s.io/component-base v0.0.0-20210411032642-18d65a503ea1
k8s.io/controller-manager => k8s.io/controller-manager v0.0.0-20210411034739-a7c712bd6b9e
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210411071641-d23dd757f6df
k8s.io/apiserver => k8s.io/apiserver v0.0.0-20210412033426-c5d971fadc40
k8s.io/client-go => k8s.io/client-go v0.0.0-20210411032915-0cfeb7fda9de
k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20210412040536-da4287c2bc54
k8s.io/component-base => k8s.io/component-base v0.0.0-20210412032905-a57cc3fac704
k8s.io/controller-manager => k8s.io/controller-manager v0.0.0-20210412040347-41b09a398481
)

21
go.sum
View File

@ -334,8 +334,12 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU=
go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA=
go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
go.uber.org/zap v1.16.0/go.mod h1:MA8QOfq0BHJwdXa996Y4dYkAqRKB8/1K1QMMZVaNZjQ=
golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
@ -376,6 +380,7 @@ golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzB
golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.3.1-0.20200828183125-ce943fd02449/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@ -451,6 +456,7 @@ golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7w
golang.org/x/sys v0.0.0-20200831180312-196b9ba8737a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
@ -486,6 +492,8 @@ golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgw
golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
@ -504,6 +512,7 @@ golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapK
golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@ -596,12 +605,12 @@ 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/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
k8s.io/api v0.0.0-20210411031832-6eed676bc189/go.mod h1:JXXrMe9Wof3EUw/ssiQP6ll7CtQlIlNU2svwStG2DMg=
k8s.io/apimachinery v0.0.0-20210411031630-d8cdd62f18c3/go.mod h1:CRK4uy8GKqwLtMa4Gj9i/B2EBjcqOsuvwP2xZJWUwmk=
k8s.io/apiserver v0.0.0-20210411033040-cba9cd88c4ae/go.mod h1:ZHAjdFoIgHDKd0yAD6ya8pvCsuYESFy+IkW2TSR7o7I=
k8s.io/client-go v0.0.0-20210411032117-0bb6464b1348/go.mod h1:eNM4jkRT9u9brnTVu+nC+EVJQmxvEgtoC0ZyPrfG3pU=
k8s.io/cloud-provider v0.0.0-20210411034841-6c4b94e92b1e/go.mod h1:UsF9AKec5HiUh+efKcG/6LhiH9orsUH+4AyX8j7+i3I=
k8s.io/component-base v0.0.0-20210411032642-18d65a503ea1/go.mod h1:PRyCZLq8ZOPvC66ZNBDGORsa/8LqizoWzwHZkyxgspw=
k8s.io/controller-manager v0.0.0-20210411034739-a7c712bd6b9e/go.mod h1:vfclNToLxWjsRVAXz9NacVmcwkdg4enexqMqp7NmB3g=
k8s.io/apimachinery v0.0.0-20210411071641-d23dd757f6df/go.mod h1:CRK4uy8GKqwLtMa4Gj9i/B2EBjcqOsuvwP2xZJWUwmk=
k8s.io/apiserver v0.0.0-20210412033426-c5d971fadc40/go.mod h1:ESH1DItG5j8KnJ4gkhHD+qzhcjXg+A4XXxKoD4Hoja0=
k8s.io/client-go v0.0.0-20210411032915-0cfeb7fda9de/go.mod h1:eNM4jkRT9u9brnTVu+nC+EVJQmxvEgtoC0ZyPrfG3pU=
k8s.io/cloud-provider v0.0.0-20210412040536-da4287c2bc54/go.mod h1:bI2QzxBTFCNNlMPBP3C6+kLYVowaXsOG69n9TWzzHhA=
k8s.io/component-base v0.0.0-20210412032905-a57cc3fac704/go.mod h1:zEytEW+Y696JL4g97mo/bP6hzeY26r9zDRw2IFbc7fE=
k8s.io/controller-manager v0.0.0-20210412040347-41b09a398481/go.mod h1:RY8xwVMVl+kNX61jzDmNq86OE9fGesfHI1TdN8o4AaQ=
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.8.0 h1:Q3gmuM9hKEjefWFFYF0Mat+YyFJvsUyYuwyNNJ5C9Ts=