Merge pull request openshift#295 from mlguerrero12/OCPBUGS-29648-415

OCPBUGS-36367: [release-4.15] Return previous IP allocation for add cmd

.gitignore

@@ -13,3 +13,5 @@
 
 bin/
 /github.com/
+
+.idea/

cmd/whereabouts.go

@@ -25,12 +25,12 @@ func main() {
 			return err
 		}
 		logging.Debugf("ADD - IPAM configuration successfully read: %+v", *ipamConf)
-		ipam, err := kubernetes.NewKubernetesIPAM(args.ContainerID, *ipamConf)
+		ipam, err := kubernetes.NewKubernetesIPAM(args.ContainerID, args.IfName, *ipamConf)
 		if err != nil {
 			return logging.Errorf("failed to create Kubernetes IPAM manager: %v", err)
 		}
 		defer func() { safeCloseKubernetesBackendConnection(ipam) }()
-		return cmdAdd(args, ipam, confVersion)
+		return cmdAdd(ipam, confVersion)
 	},
 		cmdCheck,
 		func(args *skel.CmdArgs) error {
@@ -41,12 +41,12 @@ func main() {
 			}
 			logging.Debugf("DEL - IPAM configuration successfully read: %+v", *ipamConf)
 
-			ipam, err := kubernetes.NewKubernetesIPAM(args.ContainerID, *ipamConf)
+			ipam, err := kubernetes.NewKubernetesIPAM(args.ContainerID, args.IfName, *ipamConf)
 			if err != nil {
 				return logging.Errorf("IPAM client initialization error: %v", err)
 			}
 			defer func() { safeCloseKubernetesBackendConnection(ipam) }()
-			return cmdDel(args, ipam)
+			return cmdDel(ipam)
 		},
 		cniversion.All,
 		fmt.Sprintf("whereabouts %s", version.GetFullVersionWithRuntimeInfo()),
@@ -64,13 +64,12 @@ func cmdCheck(args *skel.CmdArgs) error {
 	return fmt.Errorf("CNI CHECK method is not implemented")
 }
 
-func cmdAdd(args *skel.CmdArgs, client *kubernetes.KubernetesIPAM, cniVersion string) error {
+func cmdAdd(client *kubernetes.KubernetesIPAM, cniVersion string) error {
 	// Initialize our result, and assign DNS & routing.
 	result := &current.Result{}
 	result.DNS = client.Config.DNS
 	result.Routes = client.Config.Routes
 
-	logging.Debugf("Beginning IPAM for ContainerID: %v", args.ContainerID)
 	var newips []net.IPNet
 
 	ctx, cancel := context.WithTimeout(context.Background(), types.AddTimeLimit)
@@ -108,9 +107,7 @@ func cmdAdd(args *skel.CmdArgs, client *kubernetes.KubernetesIPAM, cniVersion st
 	return cnitypes.PrintResult(result, cniVersion)
 }
 
-func cmdDel(args *skel.CmdArgs, client *kubernetes.KubernetesIPAM) error {
-	logging.Debugf("Beginning delete for ContainerID: %v", args.ContainerID)
-
+func cmdDel(client *kubernetes.KubernetesIPAM) error {
 	ctx, cancel := context.WithTimeout(context.Background(), types.DelTimeLimit)
 	defer cancel()