cni should not invoke cns to release ips for muiltitenancy

Azure · Nov 8, 2023 · 1c4259c · 1c4259c
1 parent b3faa2f
commit 1c4259c
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/cni/network/network.go b/cni/network/network.go
@@ -535,7 +535,10 @@ func (plugin *NetPlugin) Add(args *cniSkel.CmdArgs) error {
 
 		defer func() { //nolint:gocritic
 			if err != nil {
-				plugin.cleanupAllocationOnError(ipamAddResult.defaultInterfaceInfo.ipResult, nwCfg, args, options)
+				// for multi-tenancies scenario, CNI is not supposed to invoke CNS for cleaning Ips
+				if !(nwCfg.MultiTenancy && nwCfg.IPAM.Type == network.AzureCNS) {
+					plugin.cleanupAllocationOnError(ipamAddResult.defaultInterfaceInfo.ipResult, nwCfg, args, options)
+				}
 			}
 		}()