File tree Expand file tree Collapse file tree 3 files changed +10
-13
lines changed Expand file tree Collapse file tree 3 files changed +10
-13
lines changed Original file line number Diff line number Diff line change @@ -38,13 +38,6 @@ import (
38
38
"sigs.k8s.io/controller-runtime/pkg/reconcile"
39
39
"sigs.k8s.io/controller-runtime/pkg/source"
40
40
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
-
48
41
infrav1 "sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
49
42
"sigs.k8s.io/cluster-api-provider-aws/v2/feature"
50
43
"sigs.k8s.io/cluster-api-provider-aws/v2/pkg/cloud/scope"
@@ -58,6 +51,12 @@ import (
58
51
"sigs.k8s.io/cluster-api-provider-aws/v2/pkg/cloud/services/securitygroup"
59
52
"sigs.k8s.io/cluster-api-provider-aws/v2/pkg/logger"
60
53
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"
61
60
)
62
61
63
62
var defaultAWSSecurityGroupRoles = []infrav1.SecurityGroupRole {
Original file line number Diff line number Diff line change @@ -31,16 +31,15 @@ import (
31
31
"github.com/pkg/errors"
32
32
"k8s.io/apimachinery/pkg/util/sets"
33
33
34
- clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
35
- "sigs.k8s.io/cluster-api/util/conditions"
36
-
37
34
infrav1 "sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
38
35
"sigs.k8s.io/cluster-api-provider-aws/v2/pkg/cloud/awserrors"
39
36
"sigs.k8s.io/cluster-api-provider-aws/v2/pkg/cloud/converters"
40
37
"sigs.k8s.io/cluster-api-provider-aws/v2/pkg/cloud/scope"
41
38
"sigs.k8s.io/cluster-api-provider-aws/v2/pkg/cloud/services/wait"
42
39
"sigs.k8s.io/cluster-api-provider-aws/v2/pkg/hash"
43
40
"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"
44
43
)
45
44
46
45
// ResourceGroups are filtered by ARN identifier: https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html#arns-syntax
Original file line number Diff line number Diff line change @@ -35,12 +35,11 @@ import (
35
35
"k8s.io/utils/pointer"
36
36
"sigs.k8s.io/controller-runtime/pkg/client/fake"
37
37
38
- clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
39
- "sigs.k8s.io/cluster-api/util/conditions"
40
-
41
38
infrav1 "sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
42
39
"sigs.k8s.io/cluster-api-provider-aws/v2/pkg/cloud/scope"
43
40
"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"
44
43
)
45
44
46
45
func TestELBName (t * testing.T ) {
You can’t perform that action at this time.
0 commit comments