Skip to content

Commit a95ddfa

Browse files
authored
[fix] Remove deletion of LinodeVPC and LinodeFirewall in e2etest (#749)
We no longer need to delete them explicitly since we have now implemented ownerRefs. Just deleting Cluster will cascade the deletion to all the other resources like LinodeVPC, LinodeFirewall, LinodePlacementgroyp, etc.
1 parent b94c4ee commit a95ddfa

File tree

3 files changed

+0
-33
lines changed

3 files changed

+0
-33
lines changed

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

-15
Original file line numberDiff line numberDiff line change
@@ -130,21 +130,6 @@ spec:
130130
apiVersion: cluster.x-k8s.io/v1beta1
131131
kind: Cluster
132132
name: ($cluster)
133-
- delete:
134-
ref:
135-
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2
136-
kind: LinodeVPC
137-
name: ($cluster)
138-
- delete:
139-
ref:
140-
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2
141-
kind: LinodeFirewall
142-
name: ($cluster)
143-
- delete:
144-
ref:
145-
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2
146-
kind: LinodeFirewall
147-
name: ($cluster)-nb
148133
- error:
149134
file: check-child-cluster-vpc-and-firewall-deleted.yaml
150135
- name: Check if the linodes are deleted

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

-3
Original file line numberDiff line numberDiff line change
@@ -147,9 +147,6 @@ spec:
147147
exit 0
148148
fi
149149
kubectl delete cluster $CLUSTER -n $NAMESPACE --timeout=120s || { echo "deletion failed!"; exit 1; }
150-
kubectl delete linodevpc $CLUSTER -n $NAMESPACE --timeout=120s || { echo "deletion failed!"; exit 1; }
151-
kubectl delete linodefirewall $CLUSTER -n $NAMESPACE --timeout=120s || { echo "deletion failed!"; exit 1; }
152-
kubectl delete linodefirewall $CLUSTER-nb -n $NAMESPACE --timeout=120s || { echo "deletion failed!"; exit 1; }
153150
check:
154151
($error == null): true
155152
(contains($stdout, 'deletion failed')): false

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

-15
Original file line numberDiff line numberDiff line change
@@ -129,21 +129,6 @@ spec:
129129
apiVersion: cluster.x-k8s.io/v1beta1
130130
kind: Cluster
131131
name: ($cluster)
132-
- delete:
133-
ref:
134-
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2
135-
kind: LinodeVPC
136-
name: ($cluster)
137-
- delete:
138-
ref:
139-
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2
140-
kind: LinodeFirewall
141-
name: ($cluster)
142-
- delete:
143-
ref:
144-
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2
145-
kind: LinodeFirewall
146-
name: ($cluster)-nb
147132
- error:
148133
file: check-child-cluster-vpc-and-firewall-deleted.yaml
149134
- name: Check if the linodes are deleted

0 commit comments

Comments
 (0)