From d7a67a3b8e596e32e09274e233f3cb0ae3c581c8 Mon Sep 17 00:00:00 2001 From: Madhav Jivrajani Date: Sun, 23 May 2021 13:45:20 +0530 Subject: [PATCH] change log line to print actual pod uid instead of address of the pod uid Signed-off-by: Madhav Jivrajani --- pkg/kubelet/pod/mirror_client.go | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkg/kubelet/pod/mirror_client.go b/pkg/kubelet/pod/mirror_client.go index 89f4c18f997..b5f7490e59a 100644 --- a/pkg/kubelet/pod/mirror_client.go +++ b/pkg/kubelet/pod/mirror_client.go @@ -42,7 +42,7 @@ type MirrorClient interface { DeleteMirrorPod(podFullName string, uid *types.UID) (bool, error) } -// nodeGetter is a subset a NodeLister, simplified for testing. +// nodeGetter is a subset of NodeLister, simplified for testing. type nodeGetter interface { // Get retrieves the Node for a given name. Get(name string) (*v1.Node, error) @@ -122,7 +122,13 @@ func (mc *basicMirrorClient) DeleteMirrorPod(podFullName string, uid *types.UID) klog.ErrorS(err, "Failed to parse a pod full name", "podFullName", podFullName) return false, err } - klog.V(2).InfoS("Deleting a mirror pod", "pod", klog.KRef(namespace, name), "podUID", uid) + + var uidValue types.UID + if uid != nil { + uidValue = *uid + } + klog.V(2).InfoS("Deleting a mirror pod", "pod", klog.KRef(namespace, name), "podUID", uidValue) + var GracePeriodSeconds int64 if err := mc.apiserverClient.CoreV1().Pods(namespace).Delete(context.TODO(), name, metav1.DeleteOptions{GracePeriodSeconds: &GracePeriodSeconds, Preconditions: &metav1.Preconditions{UID: uid}}); err != nil { // Unfortunately, there's no generic error for failing a precondition