From e153b706fcf267f8d7268af4c3b12b045f11c669 Mon Sep 17 00:00:00 2001 From: Ashvin Deodhar Date: Thu, 9 May 2019 14:36:48 -0700 Subject: [PATCH] Delete container even if NetNs is not specified --- cni/network/network.go | 2 +- cni/network/network_windows.go | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/cni/network/network.go b/cni/network/network.go index 6531b9d974..3152a600f1 100644 --- a/cni/network/network.go +++ b/cni/network/network.go @@ -619,7 +619,7 @@ func (plugin *netPlugin) Delete(args *cniSkel.CmdArgs) error { // Parse Pod arguments. k8sPodName, k8sNamespace, err := plugin.getPodInfo(args.Args) if err != nil { - return err + log.Printf("[cni-net] Failed to get POD info due to error: %v", err) } // Initialize values from network config. diff --git a/cni/network/network_windows.go b/cni/network/network_windows.go index ade61ca479..7d701c4533 100644 --- a/cni/network/network_windows.go +++ b/cni/network/network_windows.go @@ -116,6 +116,11 @@ func getNetworkName(podName, podNs, ifName string, nwCfg *cni.NetworkConfig) (ne networkName = nwCfg.Name err = nil if nwCfg.MultiTenancy { + if len(strings.TrimSpace(podName)) == 0 || len(strings.TrimSpace(podNs)) == 0 { + err = fmt.Errorf("POD info cannot be empty. PodName: %s, PodNamespace: %s", podName, podNs) + return + } + _, cnsNetworkConfig, _, err := getContainerNetworkConfiguration(nwCfg, podName, podNs, ifName) if err != nil { log.Printf("GetContainerNetworkConfiguration failed for podname %v namespace %v with error %v", podName, podNs, err)