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

Merge pull request #94680 from ingvagabund/automated-cherry-pick-of-#93687-upstream-release-1.19 

Automated cherry pick of #93687: kubectl describe pod: use ReportingController as an event

Kubernetes-commit: a1fade33c5bd8819b4adb9f629475b6797e389b5
This commit is contained in:
Kubernetes Publisher 2020-09-10 21:28:14 -07:00
parent 060905e8fc
commit 879b2b4aff
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Godeps/Godeps.json generated
View File

@ -768,7 +768,7 @@
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "3e55cca68bbc"
"Rev": "bb0bc934b5b4"
},
{
"ImportPath": "k8s.io/code-generator",
@ -776,7 +776,7 @@
},
{
"ImportPath": "k8s.io/component-base",
"Rev": "3dc91be9f86c"
"Rev": "fb56c9a8ad13"
},
{
"ImportPath": "k8s.io/gengo",
@ -792,7 +792,7 @@
},
{
"ImportPath": "k8s.io/metrics",
"Rev": "a355810fe42f"
"Rev": "db3b6cc174e5"
},
{
"ImportPath": "k8s.io/utils",

12
go.mod
View File

@ -37,11 +37,11 @@ require (
k8s.io/api v0.0.0-20200821172135-21b59c1ded36
k8s.io/apimachinery v0.0.0-20200821171749-b63a0c883fbf
k8s.io/cli-runtime v0.0.0-20200821180036-613970382155
k8s.io/client-go v0.0.0-20200821172742-3e55cca68bbc
k8s.io/component-base v0.0.0-20200821173348-3dc91be9f86c
k8s.io/client-go v0.0.0-20200904053452-bb0bc934b5b4
k8s.io/component-base v0.0.0-20200910212707-fb56c9a8ad13
k8s.io/klog/v2 v2.2.0
k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6
k8s.io/metrics v0.0.0-20200821175821-a355810fe42f
k8s.io/metrics v0.0.0-20200910214553-db3b6cc174e5
k8s.io/utils v0.0.0-20200729134348-d5654de09c73
sigs.k8s.io/kustomize v2.0.3+incompatible
sigs.k8s.io/yaml v1.2.0
@ -52,8 +52,8 @@ replace (
k8s.io/api => k8s.io/api v0.0.0-20200821172135-21b59c1ded36
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200821171749-b63a0c883fbf
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20200821180036-613970382155
k8s.io/client-go => k8s.io/client-go v0.0.0-20200821172742-3e55cca68bbc
k8s.io/client-go => k8s.io/client-go v0.0.0-20200904053452-bb0bc934b5b4
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20200813171329-1c3794b15e35
k8s.io/component-base => k8s.io/component-base v0.0.0-20200821173348-3dc91be9f86c
k8s.io/metrics => k8s.io/metrics v0.0.0-20200821175821-a355810fe42f
k8s.io/component-base => k8s.io/component-base v0.0.0-20200910212707-fb56c9a8ad13
k8s.io/metrics => k8s.io/metrics v0.0.0-20200910214553-db3b6cc174e5
)

6
go.sum
View File

@ -511,9 +511,9 @@ honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt
k8s.io/api v0.0.0-20200821172135-21b59c1ded36/go.mod h1:WXzrXjAr+IgCMGkIbOU4i87rvN7UWNGsyNmBEkW9rx8=
k8s.io/apimachinery v0.0.0-20200821171749-b63a0c883fbf/go.mod h1:DnPGDnARWFvYa3pMHgSxtbZb7gpzzAZ1pTfaUNDVlmA=
k8s.io/cli-runtime v0.0.0-20200821180036-613970382155/go.mod h1:IVVYq4ZROvROdTjn96acqGoWsk3dgHOCXL9jT7rkDi4=
k8s.io/client-go v0.0.0-20200821172742-3e55cca68bbc/go.mod h1:SnLtmp6F+NMdYHYqnSKVWW81iA2wv5QfXXncW8aWuKc=
k8s.io/client-go v0.0.0-20200904053452-bb0bc934b5b4/go.mod h1:SnLtmp6F+NMdYHYqnSKVWW81iA2wv5QfXXncW8aWuKc=
k8s.io/code-generator v0.0.0-20200813171329-1c3794b15e35/go.mod h1:moqLn7w0t9cMs4+5CQyxnfA/HV8MF6aAVENF+WZZhgk=
k8s.io/component-base v0.0.0-20200821173348-3dc91be9f86c/go.mod h1:2biu10irpN6fDj3aQma6z89MIJt4kjKHWeXT391jIJQ=
k8s.io/component-base v0.0.0-20200910212707-fb56c9a8ad13/go.mod h1:UTTVdFWcXRP6MZpCZLylAUxBCHIXYDY56m6MI2Nqz+o=
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=
@ -521,7 +521,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-20200805222855-6aeccd4b50c6 h1:+WnxoVtG8TMiudHBSEtrVL1egv36TkkJm+bA8AxicmQ=
k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6/go.mod h1:UuqjUnNftUyPE5H64/qeyjQoUZhGpeFDVdxjTeEVN2o=
k8s.io/metrics v0.0.0-20200821175821-a355810fe42f/go.mod h1:O3lIsyo/rPyOkpRcgjywtHHCZJLL8GPPNQGCV65mouY=
k8s.io/metrics v0.0.0-20200910214553-db3b6cc174e5/go.mod h1:ij7N4ZM3D9Ua/T4Hs64OX40wFIpVJYKkbnbVl4dYu/A=
k8s.io/utils v0.0.0-20200729134348-d5654de09c73 h1:uJmqzgNWG7XyClnU/mLPBWwfKKF1K8Hf8whTseBgJcg=
k8s.io/utils v0.0.0-20200729134348-d5654de09c73/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=