Skip to content

Commit 4df8d64

Browse files
Delete container even if NetNs is not specified (#357)
1 parent 1ef6442 commit 4df8d64

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

cni/network/network.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -619,7 +619,7 @@ func (plugin *netPlugin) Delete(args *cniSkel.CmdArgs) error {
619619
// Parse Pod arguments.
620620
k8sPodName, k8sNamespace, err := plugin.getPodInfo(args.Args)
621621
if err != nil {
622-
return err
622+
log.Printf("[cni-net] Failed to get POD info due to error: %v", err)
623623
}
624624

625625
// Initialize values from network config.

cni/network/network_windows.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,11 @@ func getNetworkName(podName, podNs, ifName string, nwCfg *cni.NetworkConfig) (ne
116116
networkName = nwCfg.Name
117117
err = nil
118118
if nwCfg.MultiTenancy {
119+
if len(strings.TrimSpace(podName)) == 0 || len(strings.TrimSpace(podNs)) == 0 {
120+
err = fmt.Errorf("POD info cannot be empty. PodName: %s, PodNamespace: %s", podName, podNs)
121+
return
122+
}
123+
119124
_, cnsNetworkConfig, _, err := getContainerNetworkConfiguration(nwCfg, podName, podNs, ifName)
120125
if err != nil {
121126
log.Printf("GetContainerNetworkConfiguration failed for podname %v namespace %v with error %v", podName, podNs, err)

0 commit comments

Comments
 (0)