Skip to content

Commit d591aaa

Browse files
k0dak0da
committed
Bump capi to 1.10.2
Signed-off-by: Dinar Valeev <[email protected]>
1 parent 785629d commit d591aaa

File tree

8 files changed

+274
-563
lines changed

8 files changed

+274
-563
lines changed

‎api/v1beta2/awscluster_webhook_test.go‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,17 +32,8 @@ import (
3232

3333
"sigs.k8s.io/cluster-api-provider-aws/v2/feature"
3434
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
35-
utildefaulting "sigs.k8s.io/cluster-api/util/defaulting"
3635
)
3736

38-
func TestAWSClusterDefault(t *testing.T) {
39-
cluster := &AWSCluster{ObjectMeta: metav1.ObjectMeta{Name: "foo", Namespace: "default"}}
40-
t.Run("for AWSCluster", utildefaulting.DefaultValidateTest(cluster))
41-
cluster.Default()
42-
g := NewWithT(t)
43-
g.Expect(cluster.Spec.IdentityRef).NotTo(BeNil())
44-
}
45-
4637
func TestAWSClusterValidateCreate(t *testing.T) {
4738
unsupportedIncorrectScheme := ELBScheme("any-other-scheme")
4839

‎api/v1beta2/awsmachine_webhook_test.go‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,17 +28,8 @@ import (
2828
"k8s.io/utils/ptr"
2929

3030
"sigs.k8s.io/cluster-api-provider-aws/v2/feature"
31-
utildefaulting "sigs.k8s.io/cluster-api/util/defaulting"
3231
)
3332

34-
func TestMachineDefault(t *testing.T) {
35-
machine := &AWSMachine{ObjectMeta: metav1.ObjectMeta{Name: "foo", Namespace: "default"}}
36-
t.Run("for AWSMachine", utildefaulting.DefaultValidateTest(machine))
37-
machine.Default()
38-
g := NewWithT(t)
39-
g.Expect(machine.Spec.CloudInit.SecureSecretsBackend).To(Equal(SecretBackendSecretsManager))
40-
}
41-
4233
func TestAWSMachineCreate(t *testing.T) {
4334
tests := []struct {
4435
name string

‎controlplane/eks/api/v1beta2/awsmanagedcontrolplane_webhook_test.go‎

Lines changed: 0 additions & 129 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ import (
2828
"k8s.io/utils/ptr"
2929

3030
infrav1 "sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
31-
utildefaulting "sigs.k8s.io/cluster-api/util/defaulting"
3231
)
3332

3433
var (
@@ -37,134 +36,6 @@ var (
3736
vV1_16 = "v1.16"
3837
)
3938

40-
func TestDefaultingWebhook(t *testing.T) {
41-
defaultTestBastion := infrav1.Bastion{
42-
AllowedCIDRBlocks: []string{"0.0.0.0/0"},
43-
}
44-
AZUsageLimit := 3
45-
defaultVPCSpec := infrav1.VPCSpec{
46-
AvailabilityZoneUsageLimit: &AZUsageLimit,
47-
AvailabilityZoneSelection: &infrav1.AZSelectionSchemeOrdered,
48-
SubnetSchema: &infrav1.SubnetSchemaPreferPrivate,
49-
}
50-
defaultIdentityRef := &infrav1.AWSIdentityReference{
51-
Kind: infrav1.ControllerIdentityKind,
52-
Name: infrav1.AWSClusterControllerIdentityName,
53-
}
54-
defaultNetworkSpec := infrav1.NetworkSpec{
55-
VPC: defaultVPCSpec,
56-
CNI: &infrav1.CNISpec{
57-
CNIIngressRules: []infrav1.CNIIngressRule{
58-
{
59-
Description: "bgp (calico)",
60-
Protocol: "tcp",
61-
FromPort: 179,
62-
ToPort: 179,
63-
},
64-
{
65-
Description: "IP-in-IP (calico)",
66-
Protocol: "4",
67-
FromPort: -1,
68-
ToPort: 65535,
69-
},
70-
},
71-
},
72-
}
73-
74-
tests := []struct {
75-
name string
76-
resourceName string
77-
resourceNS string
78-
expectHash bool
79-
expect string
80-
spec AWSManagedControlPlaneSpec
81-
expectSpec AWSManagedControlPlaneSpec
82-
}{
83-
{
84-
name: "less than 100 chars",
85-
resourceName: "cluster1",
86-
resourceNS: "default",
87-
expectHash: false,
88-
expectSpec: AWSManagedControlPlaneSpec{EKSClusterName: "default_cluster1", IdentityRef: defaultIdentityRef, Bastion: defaultTestBastion, NetworkSpec: defaultNetworkSpec, TokenMethod: &EKSTokenMethodIAMAuthenticator},
89-
},
90-
{
91-
name: "less than 100 chars, dot in name",
92-
resourceName: "team1.cluster1",
93-
resourceNS: "default",
94-
expectHash: false,
95-
expectSpec: AWSManagedControlPlaneSpec{EKSClusterName: "default_team1_cluster1", IdentityRef: defaultIdentityRef, Bastion: defaultTestBastion, NetworkSpec: defaultNetworkSpec, TokenMethod: &EKSTokenMethodIAMAuthenticator},
96-
},
97-
{
98-
name: "more than 100 chars",
99-
resourceName: "abcdeabcdeabcdeabcdeabcdeabcdeabcdeabcdeabcdeabcdeabcdeabcdeabcdeabcdeabcdeabcdeabcdeabcdeabcdeabcde",
100-
resourceNS: "default",
101-
expectHash: true,
102-
expectSpec: AWSManagedControlPlaneSpec{EKSClusterName: "capi_", IdentityRef: defaultIdentityRef, Bastion: defaultTestBastion, NetworkSpec: defaultNetworkSpec, TokenMethod: &EKSTokenMethodIAMAuthenticator},
103-
},
104-
{
105-
name: "with patch",
106-
resourceName: "cluster1",
107-
resourceNS: "default",
108-
expectHash: false,
109-
spec: AWSManagedControlPlaneSpec{Version: &vV1_17_1},
110-
expectSpec: AWSManagedControlPlaneSpec{EKSClusterName: "default_cluster1", Version: &vV1_17_1, IdentityRef: defaultIdentityRef, Bastion: defaultTestBastion, NetworkSpec: defaultNetworkSpec, TokenMethod: &EKSTokenMethodIAMAuthenticator},
111-
},
112-
{
113-
name: "with allowed ip on bastion",
114-
resourceName: "cluster1",
115-
resourceNS: "default",
116-
expectHash: false,
117-
spec: AWSManagedControlPlaneSpec{Bastion: infrav1.Bastion{AllowedCIDRBlocks: []string{"100.100.100.100/0"}}},
118-
expectSpec: AWSManagedControlPlaneSpec{EKSClusterName: "default_cluster1", IdentityRef: defaultIdentityRef, Bastion: infrav1.Bastion{AllowedCIDRBlocks: []string{"100.100.100.100/0"}}, NetworkSpec: defaultNetworkSpec, TokenMethod: &EKSTokenMethodIAMAuthenticator},
119-
},
120-
{
121-
name: "with CNI on network",
122-
resourceName: "cluster1",
123-
resourceNS: "default",
124-
expectHash: false,
125-
spec: AWSManagedControlPlaneSpec{NetworkSpec: infrav1.NetworkSpec{CNI: &infrav1.CNISpec{}}},
126-
expectSpec: AWSManagedControlPlaneSpec{EKSClusterName: "default_cluster1", IdentityRef: defaultIdentityRef, Bastion: defaultTestBastion, NetworkSpec: infrav1.NetworkSpec{CNI: &infrav1.CNISpec{}, VPC: defaultVPCSpec}, TokenMethod: &EKSTokenMethodIAMAuthenticator},
127-
},
128-
{
129-
name: "secondary CIDR",
130-
resourceName: "cluster1",
131-
resourceNS: "default",
132-
expectHash: false,
133-
expectSpec: AWSManagedControlPlaneSpec{EKSClusterName: "default_cluster1", IdentityRef: defaultIdentityRef, Bastion: defaultTestBastion, NetworkSpec: defaultNetworkSpec, SecondaryCidrBlock: nil, TokenMethod: &EKSTokenMethodIAMAuthenticator},
134-
},
135-
}
136-
137-
for _, tc := range tests {
138-
t.Run(tc.name, func(t *testing.T) {
139-
ctx := context.TODO()
140-
g := NewWithT(t)
141-
142-
mcp := &AWSManagedControlPlane{
143-
ObjectMeta: metav1.ObjectMeta{
144-
Name: tc.resourceName,
145-
Namespace: tc.resourceNS,
146-
},
147-
}
148-
t.Run("for AWSManagedMachinePool", utildefaulting.DefaultValidateTest(mcp))
149-
mcp.Spec = tc.spec
150-
151-
g.Expect(testEnv.Create(ctx, mcp)).To(Succeed())
152-
153-
defer func() {
154-
testEnv.Delete(ctx, mcp)
155-
}()
156-
157-
g.Expect(mcp.Spec.EKSClusterName).ToNot(BeEmpty())
158-
159-
if tc.expectHash {
160-
g.Expect(strings.HasPrefix(mcp.Spec.EKSClusterName, "capa_")).To(BeTrue())
161-
// We don't care about the exact name
162-
tc.expectSpec.EKSClusterName = mcp.Spec.EKSClusterName
163-
}
164-
g.Expect(mcp.Spec).To(Equal(tc.expectSpec))
165-
})
166-
}
167-
}
16839

16940
func TestWebhookCreate(t *testing.T) {
17041
tests := []struct { //nolint:maligned

‎exp/api/v1beta2/awsfargateprofile_webhook_test.go‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -26,24 +26,8 @@ import (
2626
infrav1 "sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
2727
"sigs.k8s.io/cluster-api-provider-aws/v2/pkg/eks"
2828
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
29-
utildefaulting "sigs.k8s.io/cluster-api/util/defaulting"
3029
)
3130

32-
func TestAWSFargateProfileDefault(t *testing.T) {
33-
fargate := &AWSFargateProfile{ObjectMeta: metav1.ObjectMeta{Name: "foo", Namespace: "default"},
34-
Spec: FargateProfileSpec{
35-
ClusterName: "clustername",
36-
},
37-
}
38-
t.Run("for AWSFargateProfile", utildefaulting.DefaultValidateTest(fargate))
39-
fargate.Default()
40-
g := NewWithT(t)
41-
g.Expect(fargate.GetLabels()[clusterv1.ClusterNameLabel]).To(BeEquivalentTo(fargate.Spec.ClusterName))
42-
name, err := eks.GenerateEKSName(fargate.Name, fargate.Namespace, maxProfileNameLength)
43-
g.Expect(err).NotTo(HaveOccurred())
44-
g.Expect(fargate.Spec.ProfileName).To(BeEquivalentTo(name))
45-
}
46-
4731
func TestAWSFargateProfileValidateRoleNameUpdate(t *testing.T) {
4832
g := NewWithT(t)
4933

‎exp/api/v1beta2/awsmachinepool_webhook_test.go‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,8 @@ import (
2626
"k8s.io/utils/ptr"
2727

2828
infrav1 "sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
29-
utildefaulting "sigs.k8s.io/cluster-api/util/defaulting"
3029
)
3130

32-
func TestAWSMachinePoolDefault(t *testing.T) {
33-
m := &AWSMachinePool{ObjectMeta: metav1.ObjectMeta{Name: "foo", Namespace: "default"}}
34-
t.Run("for AWSCluster", utildefaulting.DefaultValidateTest(m))
35-
m.Default()
36-
g := NewWithT(t)
37-
g.Expect(m.Spec.DefaultCoolDown.Duration).To(BeNumerically(">=", 0))
38-
}
39-
4031
func TestAWSMachinePoolValidateCreate(t *testing.T) {
4132
g := NewWithT(t)
4233

‎exp/api/v1beta2/awsmanagedmachinepool_webhook_test.go‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ import (
2626
"k8s.io/utils/ptr"
2727

2828
infrav1 "sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
29-
utildefaulting "sigs.k8s.io/cluster-api/util/defaulting"
3029
)
3130

3231
var (
@@ -40,12 +39,6 @@ var (
4039
newAvailabilityZoneSubnetType = AZSubnetTypePrivate
4140
)
4241

43-
func TestAWSManagedMachinePoolDefault(t *testing.T) {
44-
fargate := &AWSManagedMachinePool{ObjectMeta: metav1.ObjectMeta{Name: "foo", Namespace: "default"}}
45-
t.Run("for AWSManagedMachinePool", utildefaulting.DefaultValidateTest(fargate))
46-
fargate.Default()
47-
}
48-
4942
func TestAWSManagedMachinePoolValidateCreate(t *testing.T) {
5043
g := NewWithT(t)
5144

0 commit comments

Comments
 (0)