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 #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 6134a49e2a
commit ea70ac3ab1
3 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Godeps/Godeps.json generated
View File

@ -410,6 +410,18 @@
"ImportPath": "go.opencensus.io",
"Rev": "v0.22.2"
},
{
"ImportPath": "go.uber.org/atomic",
"Rev": "v1.4.0"
},
{
"ImportPath": "go.uber.org/multierr",
"Rev": "v1.1.0"
},
{
"ImportPath": "go.uber.org/zap",
"Rev": "v1.10.0"
},
{
"ImportPath": "golang.org/x/crypto",
"Rev": "bac4c82f6975"
@ -528,19 +540,19 @@
},
{
"ImportPath": "k8s.io/api",
"Rev": "96dd8b8608bc"
"Rev": "54aa84730ddd"
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "1a0ee4aea6d1"
"Rev": "d8530e6c952f"
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "0adb702ae49b"
"Rev": "31e286ee1926"
},
{
"ImportPath": "k8s.io/component-base",
"Rev": "8d48f868cdb4"
"Rev": "c948a8160666"
},
{
"ImportPath": "k8s.io/gengo",

13
go.mod
View File

@ -5,16 +5,15 @@ module k8s.io/kube-controller-manager
go 1.13
require (
k8s.io/apimachinery v0.0.0
k8s.io/component-base v0.0.0
k8s.io/apimachinery v0.0.0-20200616090325-1a0ee4aea6d1
k8s.io/component-base v0.0.0-20200616093425-c948a8160666
)
replace (
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
k8s.io/api => ../api
k8s.io/apimachinery => ../apimachinery
k8s.io/client-go => ../client-go
k8s.io/component-base => ../component-base
k8s.io/kube-controller-manager => ../kube-controller-manager
k8s.io/api => k8s.io/api v0.0.0-20200616091054-54aa84730ddd
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200613000956-d8530e6c952f
k8s.io/client-go => k8s.io/client-go v0.0.0-20200616091903-31e286ee1926
k8s.io/component-base => k8s.io/component-base v0.0.0-20200616093425-c948a8160666
)

4
go.sum
View File

@ -300,6 +300,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-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-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/klog/v2 v2.0.0 h1:Foj74zO6RbjjP4hBEKjnYtjjAhGg4jNynUdYF6fJrok=
k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=