From 8dc401d14161e757540ab46e40ed443d0300cdb5 Mon Sep 17 00:00:00 2001 From: KEBE Date: Thu, 29 Aug 2019 14:39:43 +0800 Subject: [PATCH] Fix sync pod log format and a func typo. --- pkg/kubelet/status/status_manager.go | 2 +- pkg/util/pod/pod.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/kubelet/status/status_manager.go b/pkg/kubelet/status/status_manager.go index 380c7827b20..42c67ba7086 100644 --- a/pkg/kubelet/status/status_manager.go +++ b/pkg/kubelet/status/status_manager.go @@ -477,7 +477,7 @@ func (m *manager) syncPod(uid types.UID, status versionedPodStatus) { // TODO: make me easier to express from client code pod, err := m.kubeClient.CoreV1().Pods(status.podNamespace).Get(status.podName, metav1.GetOptions{}) if errors.IsNotFound(err) { - klog.V(3).Infof("Pod %q (%s) does not exist on the server", status.podName, uid) + klog.V(3).Infof("Pod %q does not exist on the server", format.PodDesc(status.podName, status.podNamespace, uid)) // If the Pod is deleted the status will be cleared in // RemoveOrphanedStatuses, so we just ignore the update here. return diff --git a/pkg/util/pod/pod.go b/pkg/util/pod/pod.go index 81d4304fa2b..079a9b63c9a 100644 --- a/pkg/util/pod/pod.go +++ b/pkg/util/pod/pod.go @@ -28,7 +28,7 @@ import ( // PatchPodStatus patches pod status. func PatchPodStatus(c clientset.Interface, namespace, name string, oldPodStatus, newPodStatus v1.PodStatus) (*v1.Pod, []byte, error) { - patchBytes, err := preparePatchBytesforPodStatus(namespace, name, oldPodStatus, newPodStatus) + patchBytes, err := preparePatchBytesForPodStatus(namespace, name, oldPodStatus, newPodStatus) if err != nil { return nil, nil, err } @@ -40,7 +40,7 @@ func PatchPodStatus(c clientset.Interface, namespace, name string, oldPodStatus, return updatedPod, patchBytes, nil } -func preparePatchBytesforPodStatus(namespace, name string, oldPodStatus, newPodStatus v1.PodStatus) ([]byte, error) { +func preparePatchBytesForPodStatus(namespace, name string, oldPodStatus, newPodStatus v1.PodStatus) ([]byte, error) { oldData, err := json.Marshal(v1.Pod{ Status: oldPodStatus, })