Update licence year, address review

Signed-off-by: Danil-Grigorev <[email protected]>

Author: Danil-Grigorev

pkg/cloud/convertersv2/tags.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2018 The Kubernetes Authors.
+Copyright 2025 The Kubernetes Authors.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

pkg/cloud/filterv2/ec2.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2018 The Kubernetes Authors.
+Copyright 2025 The Kubernetes Authors.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -14,6 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+// Package filterv2 contains the ec2 sdk related filters.
 package filterv2
 
 import (

pkg/cloud/filterv2/types.go

@@ -361,7 +361,9 @@ func getUserAgentHandler() request.NamedHandler {
 type AWSClients struct {
 	ASG               autoscaling.Client
 	EC2               ec2iface.EC2API
+	EC2V2             *ec2v2.Client
 	ELB               elbiface.ELBAPI
+	ELBV2             *elbv2.ELBV2
 	SecretsManager    secretsmanageriface.SecretsManagerAPI
 	ResourceTagging   resourcegroupstaggingapiiface.ResourceGroupsTaggingAPIAPI
 	ResourceTaggingV2 *resourcegroupstaggingapiv2.Client

pkg/cloud/scope/clients.go

@@ -330,7 +330,7 @@ func TestReconcileDelete(t *testing.T) {
 								ResourceARN: aws.String("arn:aws:elasticloadbalancing:eu-west-2:1234567890:loadbalancer/net/aec24434cd2ce4630bd14a955413ee37"),
 								Tags: []rgapit.Tag{
 									{
-										Key:   aws.String("kubernetes.io/cluster/eks-test-cluster"),
+										Key:   aws.String("kubernetes.io/cluster/cluster1"),
 										Value: aws.String("owned"),
 									},
 									{

pkg/cloud/services/gc/cleanup_test.go

@@ -80,7 +80,6 @@ func (s *Service) deleteTargetGroups(ctx context.Context, resources []*AWSResour
 }
 
 func (s *Service) isELBResourceToDelete(resource *AWSResource, resourceName string) bool {
-	// Need to update this to use the v2 service name if it's different
 	if !s.isMatchingResource(resource, "elasticloadbalancing", resourceName) {
 		return false
 	}
@@ -135,9 +134,8 @@ func (s *Service) deleteTargetGroup(ctx context.Context, targetGroupARN string)
 // describeLoadBalancers gets all elastic LBs.
 func (s *Service) describeLoadBalancers(ctx context.Context) ([]string, error) {
 	var names []string
-	// AWS SDK v2 does not have PagesWithContext, need to use paginator
-	paginator := elasticloadbalancing.NewDescribeLoadBalancersPaginator(s.elbClient, &elasticloadbalancing.DescribeLoadBalancersInput{})
 
+	paginator := elasticloadbalancing.NewDescribeLoadBalancersPaginator(s.elbClient, &elasticloadbalancing.DescribeLoadBalancersInput{})
 	for paginator.HasMorePages() {
 		output, err := paginator.NextPage(ctx)
 		if err != nil {