add pod/namespace to cni log msgs

Author: liwenwu-amazon

plugins/routed-eni/cni.go

@@ -124,11 +124,13 @@ func add(args *skel.CmdArgs, cniTypes typeswrapper.CNITYPES, grpcClient grpcwrap
 	}
 
 	if !r.Success {
-		log.Errorf("Failed to assign an IP address to container")
+		log.Errorf("Failed to assign an IP address to pod %s, namespace %s", string(k8sArgs.K8S_POD_NAME), string(k8sArgs.K8S_POD_NAMESPACE))
 		return fmt.Errorf("add cmd: failed to assign an IP address to container")
 	}
 
-	log.Debugf("Received add network response: %s, Table %d", r.IPv4Addr, r.DeviceNumber)
+	log.Infof("Received add network response for pod %s namespace %s: %s, table %d ",
+		string(k8sArgs.K8S_POD_NAME), string(k8sArgs.K8S_POD_NAMESPACE),
+		r.IPv4Addr, r.DeviceNumber)
 
 	addr := &net.IPNet{
 		IP:   net.ParseIP(r.IPv4Addr),
@@ -147,7 +149,8 @@ func add(args *skel.CmdArgs, cniTypes typeswrapper.CNITYPES, grpcClient grpcwrap
 	err = driverClient.SetupNS(hostVethName, args.IfName, args.Netns, addr, int(r.DeviceNumber))
 
 	if err != nil {
-		log.Errorf("Failed SetupPodNetwork: %v", err)
+		log.Errorf("Failed SetupPodNetwork for pod %s namespace %s: %v",
+			string(k8sArgs.K8S_POD_NAME), string(k8sArgs.K8S_POD_NAMESPACE), err)
 		return errors.Wrap(err, "add command: failed to setup network")
 	}
 
@@ -203,12 +206,14 @@ func del(args *skel.CmdArgs, cniTypes typeswrapper.CNITYPES, grpcClient grpcwrap
 			IPv4Addr:          k8sArgs.IP.String()})
 
 	if err != nil {
-		log.Errorf("Error received from backend server for del network request: %v", err)
+		log.Errorf("Error received from backend server for del network request for pod %s namespace %s: %v",
+			string(k8sArgs.K8S_POD_NAME), string(k8sArgs.K8S_POD_NAMESPACE), err)
 		return err
 	}
 
 	if !r.Success {
-		log.Errorf("Failed to process delete request %v", err)
+		log.Errorf("Failed to process delete request for pod %s namespace %s: %v",
+			string(k8sArgs.K8S_POD_NAME), string(k8sArgs.K8S_POD_NAMESPACE), err)
 		return errors.Wrap(err, "del cmd: failed to process delete request")
 	}
 
@@ -220,7 +225,8 @@ func del(args *skel.CmdArgs, cniTypes typeswrapper.CNITYPES, grpcClient grpcwrap
 	err = driverClient.TeardownNS(addr, int(r.DeviceNumber))
 
 	if err != nil {
-		log.Errorf("Failed on TeardownPodNetwork %v", err)
+		log.Errorf("Failed on TeardownPodNetwork for pod %s namespace %s: %v",
+			string(k8sArgs.K8S_POD_NAME), string(k8sArgs.K8S_POD_NAMESPACE), err)
 		return err
 	}
 	return nil