keeping cluster tag same as vpc-cni

Author: yash97

pkg/aws/ec2/api/cleanup/eni_cleanup.go

@@ -133,7 +133,6 @@ func (e *ENICleaner) DeleteLeakedResources() error {
 	describeNetworkInterfaceIp := &ec2.DescribeNetworkInterfacesInput{
 		Filters: filters,
 	}
-
 	networkInterfaces, err := e.EC2Wrapper.DescribeNetworkInterfacesPagesWithRetry(describeNetworkInterfaceIp)
 	if err != nil {
 		e.Log.Error(err, "failed to describe network interfaces, cleanup will be retried in next cycle")
@@ -169,9 +168,12 @@ func (e *ENICleaner) DeleteLeakedResources() error {
 				}
 				continue
 			}
-			e.Log.Info("deleted leaked ENI successfully",
-				"eniID", nwInterface.NetworkInterfaceId,
-				"instanceID", lo.TernaryF(nwInterface.Attachment == nil, func() *string { return lo.ToPtr("") }, func() *string { return nwInterface.Attachment.InstanceId }))
+			// It is possible for eni attachment to be nil, if it was never attached to instance
+			instanceID := ""
+			if nwInterface.Attachment != nil && nwInterface.Attachment.InstanceId != nil {
+				instanceID = aws.ToString(nwInterface.Attachment.InstanceId)
+			}
+			e.Log.Info("deleted leaked ENI successfully", "eni id", *nwInterface.NetworkInterfaceId, "instance id", instanceID)
 		} else {
 			// Seeing the ENI for the first time, add it to the new list of available network interfaces
 			availableENIs[*nwInterface.NetworkInterfaceId] = struct{}{}
@@ -184,11 +186,11 @@ func (e *ENICleaner) DeleteLeakedResources() error {
 }
 
 func (e *ClusterENICleaner) GetENITagFilters() []ec2types.Filter {
-	clusterNameTagKey := fmt.Sprintf(config.ClusterNameTagKeyFormat, e.ClusterName)
+	clusterNameTagKey := config.CNINodeClusterNameKey
 	return []ec2types.Filter{
 		{
 			Name:   aws.String("tag:" + clusterNameTagKey),
-			Values: []string{config.ClusterNameTagValue},
+			Values: []string{e.ClusterName},
 		},
 	}
 }

pkg/aws/ec2/api/cleanup/eni_cleanup_test.go

@@ -15,7 +15,6 @@ package cleanup
 
 import (
 	"context"
-	"fmt"
 	"reflect"
 	"testing"
 
@@ -33,7 +32,7 @@ import (
 var (
 	mockClusterName       = "cluster-name"
 	mockNodeID            = "i-00000000000000001"
-	mockClusterNameTagKey = fmt.Sprintf(config.ClusterNameTagKeyFormat, mockClusterName)
+	mockClusterNameTagKey = config.CNINodeClusterNameKey
 
 	mockNetworkInterfaceId1 = "eni-000000000000000"
 	mockNetworkInterfaceId2 = "eni-000000000000001"
@@ -60,7 +59,7 @@ var (
 			},
 			{
 				Name:   aws.String("tag:" + mockClusterNameTagKey),
-				Values: []string{config.ClusterNameTagValue},
+				Values: []string{mockClusterName},
 			},
 		},
 	}

pkg/aws/ec2/api/helper.go

@@ -69,8 +69,8 @@ func NewEC2APIHelper(ec2Wrapper EC2Wrapper, clusterName string) EC2APIHelper {
 	// Set the key and value of the cluster name tag which will be used to tag all the network interfaces created by
 	// the controller
 	clusterNameTag = ec2types.Tag{
-		Key:   aws.String(fmt.Sprintf(config.ClusterNameTagKeyFormat, clusterName)),
-		Value: aws.String(config.ClusterNameTagValue),
+		Key:   aws.String(config.CNINodeClusterNameKey),
+		Value: aws.String(clusterName),
 	}
 	return &ec2APIHelper{ec2Wrapper: ec2Wrapper}
 }

pkg/aws/ec2/api/helper_test.go

@@ -83,8 +83,8 @@ var (
 	}
 
 	defaultClusterNameTag = ec2types.Tag{
-		Key:   aws.String(fmt.Sprintf(config.ClusterNameTagKeyFormat, clusterName)),
-		Value: aws.String(config.ClusterNameTagValue),
+		Key:   aws.String(config.CNINodeClusterNameKey),
+		Value: aws.String(clusterName),
 	}
 
 	createNetworkInterfaceInput = &ec2.CreateNetworkInterfaceInput{

pkg/aws/ec2/api/wrapper.go

@@ -761,6 +761,7 @@ func (e *ec2Wrapper) DescribeNetworkInterfacesPagesWithRetry(input *ec2.Describe
 				attemptInterfaces = append(attemptInterfaces, &ec2types.NetworkInterface{
 					NetworkInterfaceId: nwInterface.NetworkInterfaceId,
 					TagSet:             nwInterface.TagSet,
+					Attachment:         nwInterface.Attachment,
 				})
 			}