Skip to content

Commit 3a88aed

Browse files
rahulaitrahulait
authored
[CI] : cleanup firewall as well in tests (#500)
* cleanup firewall as well * remove credentialsRef finalizer and fix test --------- Co-authored-by: Rahul Sharma <rahsharm@akamai.com>
1 parent 8747791 commit 3a88aed

File tree

10 files changed

+57
-12
lines changed

10 files changed

+57
-12
lines changed

‎cloud/scope/firewall_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,7 @@ func TestFirewallRemoveCredentialsRefFinalizer(t *testing.T) {
378378
expects func(mock *mock.MockK8sClient)
379379
}{
380380
{
381-
name: "Success - finalizer should be added to the Linode Firewall credentials Secret",
381+
name: "Success - finalizer should be removed from the Linode Firewall credentials Secret",
382382
LinodeFirewall: &infrav1alpha2.LinodeFirewall{
383383
ObjectMeta: metav1.ObjectMeta{
384384
Name: "test-fw",
@@ -409,7 +409,7 @@ func TestFirewallRemoveCredentialsRefFinalizer(t *testing.T) {
409409
*obj = cred
410410

411411
return nil
412-
}).Times(2)
412+
}).AnyTimes()
413413
mock.EXPECT().Update(gomock.Any(), gomock.Any()).Return(nil)
414414
},
415415
},

‎controller/linodefirewall_controller.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,11 @@ func (r *LinodeFirewallReconciler) reconcileDelete(
211211
return ctrl.Result{}, nil
212212
}
213213

214+
if err := fwScope.RemoveCredentialsRefFinalizer(ctx); err != nil {
215+
logger.Error(err, "failed to remove credentials finalizer")
216+
return ctrl.Result{}, err
217+
}
218+
214219
err := fwScope.LinodeClient.DeleteFirewall(ctx, *fwScope.LinodeFirewall.Spec.FirewallID)
215220
if util.IgnoreLinodeAPIError(err, http.StatusNotFound) != nil {
216221
logger.Error(err, "failed to delete Firewall")

‎e2e/capl-cluster-flavors/k3s-capl-cluster/chainsaw-test.yaml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,11 +130,16 @@ spec:
130130
name: ($cluster)
131131
- delete:
132132
ref:
133-
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
133+
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2
134134
kind: LinodeVPC
135135
name: ($cluster)
136+
- delete:
137+
ref:
138+
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2
139+
kind: LinodeFirewall
140+
name: ($cluster)
136141
- error:
137-
file: check-child-cluster-and-vpc-deleted.yaml
142+
file: check-child-cluster-vpc-and-firewall-deleted.yaml
138143
- name: Check if the linodes are deleted
139144
try:
140145
- script:

‎e2e/capl-cluster-flavors/kubeadm-full-capl-cluster/check-child-cluster-and-vpc-deleted.yaml renamed to ‎e2e/capl-cluster-flavors/k3s-capl-cluster/check-child-cluster-vpc-and-firewall-deleted.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,8 @@ apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2
88
kind: LinodeVPC
99
metadata:
1010
name: ($cluster)
11+
---
12+
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2
13+
kind: LinodeFirewall
14+
metadata:
15+
name: ($cluster)

‎e2e/capl-cluster-flavors/kubeadm-capl-cluster/chainsaw-test.yaml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,11 +133,16 @@ spec:
133133
name: ($cluster)
134134
- delete:
135135
ref:
136-
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
136+
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2
137137
kind: LinodeVPC
138138
name: ($cluster)
139+
- delete:
140+
ref:
141+
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2
142+
kind: LinodeFirewall
143+
name: ($cluster)
139144
- error:
140-
file: check-child-cluster-and-vpc-deleted.yaml
145+
file: check-child-cluster-vpc-and-firewall-deleted.yaml
141146
- name: Check if the linodes are deleted
142147
try:
143148
- script:

‎e2e/capl-cluster-flavors/k3s-capl-cluster/check-child-cluster-and-vpc-deleted.yaml renamed to ‎e2e/capl-cluster-flavors/kubeadm-capl-cluster/check-child-cluster-vpc-and-firewall-deleted.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,12 @@ metadata:
44
labels:
55
cluster.x-k8s.io/cluster-name: ($cluster)
66
---
7-
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
7+
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2
88
kind: LinodeVPC
99
metadata:
1010
name: ($cluster)
11+
---
12+
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2
13+
kind: LinodeFirewall
14+
metadata:
15+
name: ($cluster)

‎e2e/capl-cluster-flavors/kubeadm-full-capl-cluster/chainsaw-test.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -410,8 +410,13 @@ spec:
410410
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2
411411
kind: LinodeVPC
412412
name: ($cluster)
413+
- delete:
414+
ref:
415+
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2
416+
kind: LinodeFirewall
417+
name: ($cluster)
413418
- error:
414-
file: check-child-cluster-and-vpc-deleted.yaml
419+
file: check-child-cluster-vpc-and-firewall-deleted.yaml
415420

416421
# Test to check if linodes are deleted
417422
- name: Testing to check if the linodes are deleted

‎e2e/capl-cluster-flavors/kubeadm-capl-cluster/check-child-cluster-and-vpc-deleted.yaml renamed to ‎e2e/capl-cluster-flavors/kubeadm-full-capl-cluster/check-child-cluster-vpc-and-firewall-deleted.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,12 @@ metadata:
44
labels:
55
cluster.x-k8s.io/cluster-name: ($cluster)
66
---
7-
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
7+
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2
88
kind: LinodeVPC
99
metadata:
1010
name: ($cluster)
11+
---
12+
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2
13+
kind: LinodeFirewall
14+
metadata:
15+
name: ($cluster)

‎e2e/capl-cluster-flavors/rke2-capl-cluster/chainsaw-test.yaml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,11 +129,16 @@ spec:
129129
name: ($cluster)
130130
- delete:
131131
ref:
132-
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
132+
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2
133133
kind: LinodeVPC
134134
name: ($cluster)
135+
- delete:
136+
ref:
137+
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2
138+
kind: LinodeFirewall
139+
name: ($cluster)
135140
- error:
136-
file: check-child-cluster-and-vpc-deleted.yaml
141+
file: check-child-cluster-vpc-and-firewall-deleted.yaml
137142
- name: Check if the linodes are deleted
138143
try:
139144
- script:

‎e2e/capl-cluster-flavors/rke2-capl-cluster/check-child-cluster-and-vpc-deleted.yaml renamed to ‎e2e/capl-cluster-flavors/rke2-capl-cluster/check-child-cluster-vpc-and-firewall-deleted.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,12 @@ metadata:
44
labels:
55
cluster.x-k8s.io/cluster-name: ($cluster)
66
---
7-
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
7+
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2
88
kind: LinodeVPC
99
metadata:
1010
name: ($cluster)
11+
---
12+
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2
13+
kind: LinodeFirewall
14+
metadata:
15+
name: ($cluster)

0 commit comments

Comments
 (0)