Merge pull request #98488 from pohly/klog-2.5.0

klog 2.5.0 + logr 0.4.0 update

Kubernetes-commit: 76ead99a5601d89ac83a6a633cd2f828145adbff
This commit is contained in:
Kubernetes Publisher 2021-01-29 18:11:49 -08:00
commit cc25bea666
3 changed files with 30 additions and 31 deletions

18
Godeps/Godeps.json generated
View File

@ -268,7 +268,7 @@
}, },
{ {
"ImportPath": "github.com/go-logr/logr", "ImportPath": "github.com/go-logr/logr",
"Rev": "v0.2.0" "Rev": "v0.4.0"
}, },
{ {
"ImportPath": "github.com/go-openapi/jsonpointer", "ImportPath": "github.com/go-openapi/jsonpointer",
@ -908,31 +908,31 @@
}, },
{ {
"ImportPath": "k8s.io/api", "ImportPath": "k8s.io/api",
"Rev": "cfb031d9922e" "Rev": "c6cc3d92897e"
}, },
{ {
"ImportPath": "k8s.io/apimachinery", "ImportPath": "k8s.io/apimachinery",
"Rev": "d656fe577b19" "Rev": "28da342a16da"
}, },
{ {
"ImportPath": "k8s.io/apiserver", "ImportPath": "k8s.io/apiserver",
"Rev": "47ff55d998a3" "Rev": "e99c63ffaf24"
}, },
{ {
"ImportPath": "k8s.io/client-go", "ImportPath": "k8s.io/client-go",
"Rev": "c8e0107904fe" "Rev": "ab82d40f6e85"
}, },
{ {
"ImportPath": "k8s.io/cloud-provider", "ImportPath": "k8s.io/cloud-provider",
"Rev": "4ca940629641" "Rev": "c146092bc9ae"
}, },
{ {
"ImportPath": "k8s.io/component-base", "ImportPath": "k8s.io/component-base",
"Rev": "090761b6f2fb" "Rev": "8d97eb5907d0"
}, },
{ {
"ImportPath": "k8s.io/controller-manager", "ImportPath": "k8s.io/controller-manager",
"Rev": "19ec3c9b65a4" "Rev": "0da947fb96e6"
}, },
{ {
"ImportPath": "k8s.io/gengo", "ImportPath": "k8s.io/gengo",
@ -940,7 +940,7 @@
}, },
{ {
"ImportPath": "k8s.io/klog/v2", "ImportPath": "k8s.io/klog/v2",
"Rev": "v2.4.0" "Rev": "v2.5.0"
}, },
{ {
"ImportPath": "k8s.io/kube-openapi", "ImportPath": "k8s.io/kube-openapi",

20
go.mod
View File

@ -5,17 +5,17 @@ module k8s.io/kube-controller-manager
go 1.15 go 1.15
require ( require (
k8s.io/apimachinery v0.0.0-20210129200846-d656fe577b19 k8s.io/apimachinery v0.0.0-20210130040829-28da342a16da
k8s.io/cloud-provider v0.0.0-20210129203701-4ca940629641 k8s.io/cloud-provider v0.0.0-20210130043313-c146092bc9ae
k8s.io/controller-manager v0.0.0-20210129203603-19ec3c9b65a4 k8s.io/controller-manager v0.0.0-20210130043223-0da947fb96e6
) )
replace ( replace (
k8s.io/api => k8s.io/api v0.0.0-20210129201028-cfb031d9922e k8s.io/api => k8s.io/api v0.0.0-20210130041000-c6cc3d92897e
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210129200846-d656fe577b19 k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210130040829-28da342a16da
k8s.io/apiserver => k8s.io/apiserver v0.0.0-20210129202051-47ff55d998a3 k8s.io/apiserver => k8s.io/apiserver v0.0.0-20210130041911-e99c63ffaf24
k8s.io/client-go => k8s.io/client-go v0.0.0-20210129201247-c8e0107904fe k8s.io/client-go => k8s.io/client-go v0.0.0-20210130041207-ab82d40f6e85
k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20210129203701-4ca940629641 k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20210130043313-c146092bc9ae
k8s.io/component-base => k8s.io/component-base v0.0.0-20210129201716-090761b6f2fb k8s.io/component-base => k8s.io/component-base v0.0.0-20210130041611-8d97eb5907d0
k8s.io/controller-manager => k8s.io/controller-manager v0.0.0-20210129203603-19ec3c9b65a4 k8s.io/controller-manager => k8s.io/controller-manager v0.0.0-20210130043223-0da947fb96e6
) )

23
go.sum
View File

@ -111,10 +111,9 @@ github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2
github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
github.com/go-logr/logr v0.1.0 h1:M1Tv3VzNlEHg6uyACnRdtrploV2P7wZqH8BoQMtz0cg=
github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas= github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas=
github.com/go-logr/logr v0.2.0 h1:QvGt2nLcHH0WK9orKa+ppBPAxREcH364nPUedEpK0TY= github.com/go-logr/logr v0.4.0 h1:K7/B1jt6fIBQVd4Owv2MqGQClcgf0R266+7C/QjRcLc=
github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= github.com/go-logr/logr v0.4.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU=
github.com/go-openapi/jsonpointer v0.19.2/go.mod h1:3akKfEdA7DF1sugOqz1dVQHBcuDBPKZGEoHC/NkiQRg= github.com/go-openapi/jsonpointer v0.19.2/go.mod h1:3akKfEdA7DF1sugOqz1dVQHBcuDBPKZGEoHC/NkiQRg=
github.com/go-openapi/jsonpointer v0.19.3 h1:gihV7YNZK1iK6Tgwwsxo2rJbD1GTbdm72325Bq8FI3w= github.com/go-openapi/jsonpointer v0.19.3 h1:gihV7YNZK1iK6Tgwwsxo2rJbD1GTbdm72325Bq8FI3w=
github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
@ -646,17 +645,17 @@ 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.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-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
k8s.io/api v0.0.0-20210129201028-cfb031d9922e/go.mod h1:53ABT5N3hbUIrqvj8AtqG/pdaa+rfxmCsKQ2aRBQ4ZU= k8s.io/api v0.0.0-20210130041000-c6cc3d92897e/go.mod h1:CYC/UAFd7KgbWpZRO0uuoPXHiEL5Llbaf6WdpEKq/5w=
k8s.io/apimachinery v0.0.0-20210129200846-d656fe577b19/go.mod h1:Zn8td2uhRkPcF1lQatcpuW4aZakbEeCk1Zz0TKhD3zQ= k8s.io/apimachinery v0.0.0-20210130040829-28da342a16da/go.mod h1:i8xgmtlAtDhfb+vEuE+ZE2YMMOfAHV/yJkRHbPc3pTg=
k8s.io/apiserver v0.0.0-20210129202051-47ff55d998a3/go.mod h1:m8TGBZy2vHRH0oU5i5oGuvmndzftriHn6SRgSc83GsE= k8s.io/apiserver v0.0.0-20210130041911-e99c63ffaf24/go.mod h1:DeZpFZ23rA93yMlHUYKzq45YfdUy6rEb0awiaqLQUxs=
k8s.io/client-go v0.0.0-20210129201247-c8e0107904fe/go.mod h1:qptrXnBIECLVceUzdc+pr0sppAlf+G0kKxYEcOROS0o= k8s.io/client-go v0.0.0-20210130041207-ab82d40f6e85/go.mod h1:rRmbNKchOvv5id1yx5/G9r0kt9h9+pXoWrTutBp3jeo=
k8s.io/cloud-provider v0.0.0-20210129203701-4ca940629641/go.mod h1:eDqx/dkGGCgKX73gYhBVHN7moE+EEmpsBYXERtNdjQI= k8s.io/cloud-provider v0.0.0-20210130043313-c146092bc9ae/go.mod h1:H+DKsAlWeJ7+s38nHLkfPVatRUIN45jfmNDXbd+UM/w=
k8s.io/component-base v0.0.0-20210129201716-090761b6f2fb/go.mod h1:zCJsv7PRwbJGJ9/R0dUiIa/m6rA9AWiquiM2VGykxSI= k8s.io/component-base v0.0.0-20210130041611-8d97eb5907d0/go.mod h1:Sdsib4N11eqlWlw5OyawkH6ml3rcIMX+sJqFISoj/YE=
k8s.io/controller-manager v0.0.0-20210129203603-19ec3c9b65a4/go.mod h1:Sisf/5mERFVdjmKGDlohyFa75Hp54hYaQ+lZIb+LQMc= k8s.io/controller-manager v0.0.0-20210130043223-0da947fb96e6/go.mod h1:+2vPTuD1qYX9eQ79Dj0Fkopo/DyC2YAj7tTJ1KtLKVA=
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= 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.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
k8s.io/klog/v2 v2.4.0 h1:7+X0fUguPyrKEC4WjH8iGDg3laWgMo5tMnRTIGTTxGQ= k8s.io/klog/v2 v2.5.0 h1:8mOnjf1RmUPW6KRqQCfYSZq/K20Unmp3IhuZUhxl8KI=
k8s.io/klog/v2 v2.4.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= k8s.io/klog/v2 v2.5.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec=
k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd/go.mod h1:WOJ3KddDSol4tAGcJo0Tvi+dK12EcqSLqcWsryKMpfM= k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd/go.mod h1:WOJ3KddDSol4tAGcJo0Tvi+dK12EcqSLqcWsryKMpfM=
k8s.io/utils v0.0.0-20201110183641-67b214c5f920 h1:CbnUZsM497iRC5QMVkHwyl8s2tB3g7yaSHkYPkpgelw= k8s.io/utils v0.0.0-20201110183641-67b214c5f920 h1:CbnUZsM497iRC5QMVkHwyl8s2tB3g7yaSHkYPkpgelw=
k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=