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

k8s-ci-robot · web-flow · commit f99728e6f35c · 2019-02-20T03:32:48.000-08:00
kubectl: fix a bug where "describe" cannot obtain the event messages for a static pod
diff --git 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)
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -642,6 +642,9 @@ func (d *PodDescriber) Describe(namespace, name string, describerSettings descri`
`642`	`642`	`klog.Errorf("Unable to construct reference to '%#v': %v", pod, err)`
`643`	`643`	`} else {`
`644`	`644`	`ref.Kind = ""`
	`645`	`+ if _, isMirrorPod := pod.Annotations[corev1.MirrorPodAnnotationKey]; isMirrorPod {`
	`646`	`+ ref.UID = types.UID(pod.Annotations[corev1.MirrorPodAnnotationKey])`
	`647`	`+ }`
`645`	`648`	`events, _ = d.Core().Events(namespace).Search(scheme.Scheme, ref)`
`646`	`649`	`}`
`647`	`650`	`}`