Merge pull request openshift#293 from mlguerrero12/OCPBUGS-29648-416

OCPBUGS-35923: [release-4.16] Return previous IP allocation for add cmd
mlguerrero12 · Jun 27, 2024 · 2d7b9eb · 2d7b9eb
2 parents c2d65d1 + dea1f70
commit 2d7b9eb
Show file tree

Hide file tree

Showing 18 changed files with 760 additions and 529 deletions.
diff --git a/.gitignore b/.gitignore
@@ -13,3 +13,5 @@
 
 bin/
 /github.com/
+
+.idea/
diff --git a/cmd/whereabouts.go b/cmd/whereabouts.go
@@ -24,12 +24,14 @@ func cmdAddFunc(args *skel.CmdArgs) error {
 		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)
+
+	logging.Debugf("Beginning IPAM for ContainerID: %q - podRef: %q - ifName: %q", args.ContainerID, ipamConf.GetPodRef(), args.IfName)
+	return cmdAdd(ipam, confVersion)
 }
 
 func cmdDelFunc(args *skel.CmdArgs) error {
@@ -40,12 +42,14 @@ func cmdDelFunc(args *skel.CmdArgs) error {
 	}
 	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)
+
+	logging.Debugf("Beginning delete for ContainerID: %q - podRef: %q - ifName: %q", args.ContainerID, ipamConf.GetPodRef(), args.IfName)
+	return cmdDel(ipam)
 }
 
 func main() {
@@ -69,13 +73,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)
@@ -103,9 +106,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()