github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #74156 from gaorong/descirbe-mirror-pod 

kubectl: fix a bug where "describe" cannot obtain the event messages for a static pod
pull/564/head
Kubernetes Prow Robot 2019-02-20 03:32:48 -08:00 committed by GitHub
parent fed00de938 5efbdb02bf
commit f99728e6f3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/kubectl/describe/versioned/describe.go
View File

@ -642,6 +642,9 @@ func (d *PodDescriber) Describe(namespace, name string, describerSettings descri
klog.Errorf("Unable to construct reference to '%#v': %v", pod, err) klog.Errorf("Unable to construct reference to '%#v': %v", pod, err)
} else { } else {
ref.Kind = "" ref.Kind = ""
if _, isMirrorPod := pod.Annotations[corev1.MirrorPodAnnotationKey]; isMirrorPod {
ref.UID = types.UID(pod.Annotations[corev1.MirrorPodAnnotationKey])
}
events, _ = d.Core().Events(namespace).Search(scheme.Scheme, ref) events, _ = d.Core().Events(namespace).Search(scheme.Scheme, ref)
} }
} }