Merge pull request kubernetes#87858 from smarterclayton/different_type

k8s-ci-robot · web-flow · commit dde6e8e74654 · 2020-02-08T06:44:06.000-08:00
kubelet: Debug pod status output diff is wrong
diff --git a/pkg/kubelet/status/status_manager.go b/pkg/kubelet/status/status_manager.go
@@ -622,8 +622,8 @@ func (m *manager) needsReconcile(uid types.UID, status v1.PodStatus) bool {
 		// reconcile is not needed. Just return.
 		return false
 	}
-	klog.V(3).Infof("Pod status is inconsistent with cached status for pod %q, a reconciliation should be triggered:\n %+v", format.Pod(pod),
-		diff.ObjectDiff(podStatus, status))
+	klog.V(3).Infof("Pod status is inconsistent with cached status for pod %q, a reconciliation should be triggered:\n %s", format.Pod(pod),
+		diff.ObjectDiff(podStatus, &status))
 
 	return true
 }

Original file line number	Diff line number	Diff line change
`@@ -622,8 +622,8 @@ func (m *manager) needsReconcile(uid types.UID, status v1.PodStatus) bool {`
`622`	`622`	`// reconcile is not needed. Just return.`
`623`	`623`	`return false`
`624`	`624`	`}`
`625`		`- klog.V(3).Infof("Pod status is inconsistent with cached status for pod %q, a reconciliation should be triggered:\n %+v", format.Pod(pod),`
`626`		`- diff.ObjectDiff(podStatus, status))`
	`625`	`+ klog.V(3).Infof("Pod status is inconsistent with cached status for pod %q, a reconciliation should be triggered:\n %s", format.Pod(pod),`
	`626`	`+ diff.ObjectDiff(podStatus, &status))`
`627`	`627`
`628`	`628`	`return true`
`629`	`629`	`}`