From 8372568b1bb3b1a2bd5c1fe1fcdf1b19f43f208c Mon Sep 17 00:00:00 2001 From: Anish Ramasekar Date: Tue, 17 Jan 2023 16:48:51 -0800 Subject: [PATCH] fix: use generate name in logs if pod name is empty (#706) Signed-off-by: Anish Ramasekar --- pkg/webhook/webhook.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkg/webhook/webhook.go b/pkg/webhook/webhook.go index 133ab6b3d..cce872e38 100644 --- a/pkg/webhook/webhook.go +++ b/pkg/webhook/webhook.go @@ -99,6 +99,10 @@ func (m *podMutator) Handle(ctx context.Context, req admission.Request) (respons return admission.Errored(http.StatusBadRequest, err) } + podName := pod.GetName() + if podName == "" { + podName = pod.GetGenerateName() + " (prefix)" + } // for daemonset/deployment pods the namespace field is not set in objectMeta // explicitly set the namespace to request namespace pod.Namespace = req.Namespace @@ -110,7 +114,7 @@ func (m *podMutator) Handle(ctx context.Context, req admission.Request) (respons serviceAccountName = "default" } - logger := log.Log.WithName("handler").WithValues("pod", pod.Name, "namespace", pod.Namespace, "service-account", serviceAccountName) + logger := log.Log.WithName("handler").WithValues("pod", podName, "namespace", pod.Namespace, "service-account", serviceAccountName) // get service account associated with the pod serviceAccount := &corev1.ServiceAccount{} if err = m.client.Get(ctx, types.NamespacedName{Name: serviceAccountName, Namespace: pod.Namespace}, serviceAccount); err != nil {