cleaning up branch eni queue before deleting node. (#574)

Author: yash97

mocks/amazon-vcp-resource-controller-k8s/pkg/k8s/mock_k8swrapper.go

@@ -244,14 +244,12 @@ func (b *branchENIProvider) ProcessAsyncJob(job interface{}) (ctrl.Result, error
 
 // DeleteNode deletes all the cached branch ENIs associated with the trunk and removes the trunk from the cache.
 func (b *branchENIProvider) DeleteNode(nodeName string) (ctrl.Result, error) {
-	_, isPresent := b.getTrunkFromCache(nodeName)
+	trunkENI, isPresent := b.getTrunkFromCache(nodeName)
 	if !isPresent {
 		return ctrl.Result{}, fmt.Errorf("failed to find node %s", nodeName)
 	}
 
-	// At this point, the finalizer routine should have deleted all available branch ENIs
-	// Any leaked ENIs will be deleted by the periodic cleanup routine if cluster is active
-	// remove trunk from cache and de-initializer the resource provider
+	trunkENI.DeleteAllBranchENIs()
 	b.removeTrunkFromCache(nodeName)
 
 	b.log.Info("de-initialized resource provider successfully", "nodeName", nodeName)

mocks/amazon-vcp-resource-controller-k8s/pkg/provider/branch/trunk/mock_trunk.go

@@ -101,6 +101,8 @@ type TrunkENI interface {
 	Reconcile(pods []v1.Pod) bool
 	// PushENIsToFrontOfDeleteQueue pushes the eni network interfaces to the front of the delete queue
 	PushENIsToFrontOfDeleteQueue(*v1.Pod, []*ENIDetails)
+	// DeleteAllBranchENIs deletes all the branch ENI associated with the trunk and also clears the cool down queue
+	DeleteAllBranchENIs()
 	// Introspect returns the state of the Trunk ENI
 	Introspect() IntrospectResponse
 }
@@ -479,6 +481,31 @@ func (t *trunkENI) CreateAndAssociateBranchENIs(pod *v1.Pod, securityGroups []st
 	return newENIs, nil
 }
 
+// DeleteAllBranchENIs deletes all the branch ENIs associated with the trunk and all the ENIs present in the cool down
+// queue, this is the last API call to the the Trunk ENI before it is removed from cache
+func (t *trunkENI) DeleteAllBranchENIs() {
+	// Delete all the branch used by the pod on this trunk ENI
+	// Since after this call, the trunk will be removed from cache. No need to clean up its branch map
+	for _, podENIs := range t.uidToBranchENIMap {
+		for _, eni := range podENIs {
+			err := t.deleteENI(eni)
+			if err != nil {
+				// Just log, if the ENI still exists it can be removed by the dangling ENI cleaner routine
+				t.log.Error(err, "failed to delete eni", "eni id", eni.ID)
+			}
+		}
+	}
+
+	// Delete all the branch ENI present in the cool down queue
+	for _, eni := range t.deleteQueue {
+		err := t.deleteENI(eni)
+		if err != nil {
+			// Just log, if the ENI still exists it can be removed by the dangling ENI cleaner routine
+			t.log.Error(err, "failed to delete eni", "eni id", eni.ID)
+		}
+	}
+}
+
 // DeleteBranchNetworkInterface deletes the branch network interface and returns an error in case of failure to delete
 func (t *trunkENI) PushBranchENIsToCoolDownQueue(UID string) {
 	// Lock is required as Reconciler is also performing operation concurrently