Skip to content

Commit cd7273f

Browse files
author
Mario Nitchev
committed
Make gci linter happy
1 parent 430412c commit cd7273f

File tree

3 files changed

+10
-13
lines changed

3 files changed

+10
-13
lines changed

controllers/awscluster_controller.go

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,6 @@ import (
3838
"sigs.k8s.io/controller-runtime/pkg/reconcile"
3939
"sigs.k8s.io/controller-runtime/pkg/source"
4040

41-
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
42-
"sigs.k8s.io/cluster-api/util"
43-
capiannotations "sigs.k8s.io/cluster-api/util/annotations"
44-
"sigs.k8s.io/cluster-api/util/conditions"
45-
"sigs.k8s.io/cluster-api/util/patch"
46-
"sigs.k8s.io/cluster-api/util/predicates"
47-
4841
infrav1 "sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
4942
"sigs.k8s.io/cluster-api-provider-aws/v2/feature"
5043
"sigs.k8s.io/cluster-api-provider-aws/v2/pkg/cloud/scope"
@@ -58,6 +51,12 @@ import (
5851
"sigs.k8s.io/cluster-api-provider-aws/v2/pkg/cloud/services/securitygroup"
5952
"sigs.k8s.io/cluster-api-provider-aws/v2/pkg/logger"
6053
infrautilconditions "sigs.k8s.io/cluster-api-provider-aws/v2/util/conditions"
54+
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
55+
"sigs.k8s.io/cluster-api/util"
56+
capiannotations "sigs.k8s.io/cluster-api/util/annotations"
57+
"sigs.k8s.io/cluster-api/util/conditions"
58+
"sigs.k8s.io/cluster-api/util/patch"
59+
"sigs.k8s.io/cluster-api/util/predicates"
6160
)
6261

6362
var defaultAWSSecurityGroupRoles = []infrav1.SecurityGroupRole{

pkg/cloud/services/elb/loadbalancer.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,15 @@ import (
3131
"github.com/pkg/errors"
3232
"k8s.io/apimachinery/pkg/util/sets"
3333

34-
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
35-
"sigs.k8s.io/cluster-api/util/conditions"
36-
3734
infrav1 "sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
3835
"sigs.k8s.io/cluster-api-provider-aws/v2/pkg/cloud/awserrors"
3936
"sigs.k8s.io/cluster-api-provider-aws/v2/pkg/cloud/converters"
4037
"sigs.k8s.io/cluster-api-provider-aws/v2/pkg/cloud/scope"
4138
"sigs.k8s.io/cluster-api-provider-aws/v2/pkg/cloud/services/wait"
4239
"sigs.k8s.io/cluster-api-provider-aws/v2/pkg/hash"
4340
"sigs.k8s.io/cluster-api-provider-aws/v2/pkg/record"
41+
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
42+
"sigs.k8s.io/cluster-api/util/conditions"
4443
)
4544

4645
// ResourceGroups are filtered by ARN identifier: https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html#arns-syntax

pkg/cloud/services/elb/loadbalancer_test.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,11 @@ import (
3535
"k8s.io/utils/pointer"
3636
"sigs.k8s.io/controller-runtime/pkg/client/fake"
3737

38-
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
39-
"sigs.k8s.io/cluster-api/util/conditions"
40-
4138
infrav1 "sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
4239
"sigs.k8s.io/cluster-api-provider-aws/v2/pkg/cloud/scope"
4340
"sigs.k8s.io/cluster-api-provider-aws/v2/test/mocks"
41+
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
42+
"sigs.k8s.io/cluster-api/util/conditions"
4443
)
4544

4645
func TestELBName(t *testing.T) {

0 commit comments

Comments
 (0)