Skip to content

Commit 5012b2c

Browse files
Update licence year, address review
Signed-off-by: Danil-Grigorev <[email protected]>
1 parent 13f92c2 commit 5012b2c

File tree

5 files changed

+4
-24
lines changed

5 files changed

+4
-24
lines changed

pkg/cloud/convertersv2/tags.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright 2018 The Kubernetes Authors.
2+
Copyright 2025 The Kubernetes Authors.
33
44
Licensed under the Apache License, Version 2.0 (the "License");
55
you may not use this file except in compliance with the License.

pkg/cloud/filterv2/ec2.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright 2018 The Kubernetes Authors.
2+
Copyright 2025 The Kubernetes Authors.
33
44
Licensed under the Apache License, Version 2.0 (the "License");
55
you may not use this file except in compliance with the License.

pkg/cloud/filterv2/types.go

Lines changed: 0 additions & 18 deletions
This file was deleted.

pkg/cloud/services/gc/cleanup_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@ func TestReconcileDelete(t *testing.T) {
330330
ResourceARN: aws.String("arn:aws:elasticloadbalancing:eu-west-2:1234567890:loadbalancer/net/aec24434cd2ce4630bd14a955413ee37"),
331331
Tags: []rgapit.Tag{
332332
{
333-
Key: aws.String("kubernetes.io/cluster/eks-test-cluster"),
333+
Key: aws.String("kubernetes.io/cluster/cluster1"),
334334
Value: aws.String("owned"),
335335
},
336336
{

pkg/cloud/services/gc/loadbalancer.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ func (s *Service) deleteTargetGroups(ctx context.Context, resources []*AWSResour
8080
}
8181

8282
func (s *Service) isELBResourceToDelete(resource *AWSResource, resourceName string) bool {
83-
// Need to update this to use the v2 service name if it's different
8483
if !s.isMatchingResource(resource, "elasticloadbalancing", resourceName) {
8584
return false
8685
}
@@ -135,9 +134,8 @@ func (s *Service) deleteTargetGroup(ctx context.Context, targetGroupARN string)
135134
// describeLoadBalancers gets all elastic LBs.
136135
func (s *Service) describeLoadBalancers(ctx context.Context) ([]string, error) {
137136
var names []string
138-
// AWS SDK v2 does not have PagesWithContext, need to use paginator
139-
paginator := elasticloadbalancing.NewDescribeLoadBalancersPaginator(s.elbClient, &elasticloadbalancing.DescribeLoadBalancersInput{})
140137

138+
paginator := elasticloadbalancing.NewDescribeLoadBalancersPaginator(s.elbClient, &elasticloadbalancing.DescribeLoadBalancersInput{})
141139
for paginator.HasMorePages() {
142140
output, err := paginator.NextPage(ctx)
143141
if err != nil {

0 commit comments

Comments
 (0)