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

kubectl: fix a bug where "describe" cannot obtain the event messages for a static pod

Merge pull request #74156 from gaorong/descirbe-mirror-pod
f99728e6 · Kubernetes Prow Robot · GitHub · fed00de9 · 5efbdb02 · f99728e6
Unverified Commit f99728e6 authored Feb 20, 2019 by Kubernetes Prow Robot Committed by GitHub Feb 20, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

describe.go pkg/kubectl/describe/versioned/describe.go +3 -0

No files found.
--- a/pkg/kubectl/describe/versioned/describe.go
+++ b/pkg/kubectl/describe/versioned/describe.go
@@ -642,6 +642,9 @@ func (d *PodDescriber) Describe(namespace, name string, describerSettings descri
 			klog.Errorf("Unable to construct reference to '%#v': %v", pod, err)
 		} else {
 			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)
 		}
 	}