Merge pull request #91608 from yuzhiquan/feature-implement-json-logformat

Feature implement json logformat

Kubernetes-commit: fd61c3149ce2493f6d505a9d9250c1bad6f0acf4
This commit is contained in:
Kubernetes Publisher 2020-06-15 23:26:03 -07:00
parent 0d893ad5ff
commit 0e924afa7f
3 changed files with 14 additions and 11 deletions

4
Godeps/Godeps.json generated
View File

@ -668,7 +668,7 @@
}, },
{ {
"ImportPath": "k8s.io/api", "ImportPath": "k8s.io/api",
"Rev": "96dd8b8608bc" "Rev": "54aa84730ddd"
}, },
{ {
"ImportPath": "k8s.io/apimachinery", "ImportPath": "k8s.io/apimachinery",
@ -680,7 +680,7 @@
}, },
{ {
"ImportPath": "k8s.io/component-base", "ImportPath": "k8s.io/component-base",
"Rev": "8d48f868cdb4" "Rev": "c948a8160666"
}, },
{ {
"ImportPath": "k8s.io/gengo", "ImportPath": "k8s.io/gengo",

17
go.mod
View File

@ -41,10 +41,10 @@ require (
gopkg.in/natefinch/lumberjack.v2 v2.0.0 gopkg.in/natefinch/lumberjack.v2 v2.0.0
gopkg.in/square/go-jose.v2 v2.2.2 gopkg.in/square/go-jose.v2 v2.2.2
gopkg.in/yaml.v2 v2.2.8 gopkg.in/yaml.v2 v2.2.8
k8s.io/api v0.0.0 k8s.io/api v0.0.0-20200616091054-54aa84730ddd
k8s.io/apimachinery v0.0.0 k8s.io/apimachinery v0.0.0-20200616090325-1a0ee4aea6d1
k8s.io/client-go v0.0.0 k8s.io/client-go v0.0.0-20200616091903-31e286ee1926
k8s.io/component-base v0.0.0 k8s.io/component-base v0.0.0-20200616093425-c948a8160666
k8s.io/klog/v2 v2.1.0 k8s.io/klog/v2 v2.1.0
k8s.io/kube-openapi v0.0.0-20200427153329-656914f816f9 k8s.io/kube-openapi v0.0.0-20200427153329-656914f816f9
k8s.io/utils v0.0.0-20200414100711-2df71ebbae66 k8s.io/utils v0.0.0-20200414100711-2df71ebbae66
@ -56,9 +56,8 @@ require (
replace ( replace (
golang.org/x/sys => golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a // pinned to release-branch.go1.13 golang.org/x/sys => golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a // pinned to release-branch.go1.13
golang.org/x/tools => golang.org/x/tools v0.0.0-20190821162956-65e3620a7ae7 // pinned to release-branch.go1.13 golang.org/x/tools => golang.org/x/tools v0.0.0-20190821162956-65e3620a7ae7 // pinned to release-branch.go1.13
k8s.io/api => ../api k8s.io/api => k8s.io/api v0.0.0-20200616091054-54aa84730ddd
k8s.io/apimachinery => ../apimachinery k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200613000956-d8530e6c952f
k8s.io/apiserver => ../apiserver k8s.io/client-go => k8s.io/client-go v0.0.0-20200616091903-31e286ee1926
k8s.io/client-go => ../client-go k8s.io/component-base => k8s.io/component-base v0.0.0-20200616093425-c948a8160666
k8s.io/component-base => ../component-base
) )

4
go.sum
View File

@ -446,6 +446,10 @@ 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-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.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=
k8s.io/api v0.0.0-20200616091054-54aa84730ddd/go.mod h1:a/lpavzw366wC55yZ6aL8yMQpqgKljBwY8WePGt/NqQ=
k8s.io/apimachinery v0.0.0-20200613000956-d8530e6c952f/go.mod h1:diAekxQB6O2LunkgrS6bHwK4dfE2K8KIxK3GeFjrgBU=
k8s.io/client-go v0.0.0-20200616091903-31e286ee1926/go.mod h1:8wWYRaKm+AEZ4COzhp0WWvrHZZ6xjnsKXy75XMfvYno=
k8s.io/component-base v0.0.0-20200616093425-c948a8160666/go.mod h1:tilVdGHHI7TVBUKWjrMHI+DLxxpBIWY5RifTKr0P72o=
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 h1:Foj74zO6RbjjP4hBEKjnYtjjAhGg4jNynUdYF6fJrok= k8s.io/klog/v2 v2.0.0 h1:Foj74zO6RbjjP4hBEKjnYtjjAhGg4jNynUdYF6fJrok=
k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=