From da1e0aa2ee2311c6587ca1dbf1f1c28792c68f36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Dulko?= <mdulko@redhat.com>
Date: Wed, 4 Mar 2020 13:47:08 +0100
Subject: [PATCH] Log CNI_ARGS and CNI_NETNS in kuryr-cni
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently we only print "Calling Kuryr Daemon." in our kuryr-cni plugin
binary. This isn't really helpful:

crio[1963]: 2020/03/03 20:53:49 Calling Kuryr Daemon.
crio[1963]: 2020/03/03 20:53:53 Calling Kuryr Daemon.
crio[1963]: 2020/03/03 20:53:53 Calling Kuryr Daemon.
crio[1963]: 2020/03/03 20:53:53 Calling Kuryr Daemon.
crio[1963]: 2020/03/03 20:53:54 Calling Kuryr Daemon.
crio[1963]: 2020/03/03 20:53:54 Calling Kuryr Daemon.
crio[1963]: 2020/03/03 20:53:54 Calling Kuryr Daemon.
(…)

This commit enhances that logging to include values of CNI_ARGS and
CNI_NETNS, which should allow us to identify which request is being
handled.

Change-Id: Ie66e4972cc109990d0f4fc077fa9031ac67db7ff
Related-Bug: 1854928
---
 kuryr_cni/main.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kuryr_cni/main.go b/kuryr_cni/main.go
index 0dd13a0b5..5b9a906b6 100644
--- a/kuryr_cni/main.go
+++ b/kuryr_cni/main.go
@@ -55,7 +55,7 @@ func transformData(args *skel.CmdArgs, command string) (KuryrDaemonData, error)
 }
 
 func makeDaemonRequest(data KuryrDaemonData, expectedCode int) ([]byte, error) {
-	log.Print("Calling Kuryr Daemon.")
+	log.Printf("Calling kuryr-daemon with %s request (CNI_ARGS=%s, CNI_NETNS=%s).", data.Command, data.Args, data.Netns)
 
 	b, err := json.Marshal(data)
 	if err != nil {