Skip to content

Commit 1004b4a

Browse files
committed
Fix nil pointer error for Network
Signed-off-by: rustyclock <[email protected]>
1 parent 5266896 commit 1004b4a

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

controllers/openstackcluster_controller.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ func (r *OpenStackClusterReconciler) reconcileDelete(ctx context.Context, log lo
156156
return reconcile.Result{}, err
157157
}
158158

159-
if openStackCluster.Spec.ManagedAPIServerLoadBalancer {
159+
if openStackCluster.Spec.ManagedAPIServerLoadBalancer && openStackCluster.Status.Network != nil {
160160
if apiLb := openStackCluster.Status.Network.APIServerLoadBalancer; apiLb != nil {
161161
if err = loadBalancerService.DeleteLoadBalancer(apiLb.Name, openStackCluster); err != nil {
162162
return reconcile.Result{}, errors.Errorf("failed to delete load balancer: %v", err)
@@ -189,17 +189,17 @@ func (r *OpenStackClusterReconciler) reconcileDelete(ctx context.Context, log lo
189189
r.Recorder.Eventf(openStackCluster, corev1.EventTypeNormal, "SuccessfulDeleteSecurityGroup", "Deleted security group %s with id %s", controlPlaneSecGroup.Name, controlPlaneSecGroup.ID)
190190
}
191191

192-
if router := openStackCluster.Status.Network.Router; router != nil {
193-
log.Info("Deleting router", "name", router.Name)
194-
if err = networkingService.DeleteRouter(openStackCluster.Status.Network); err != nil {
195-
return ctrl.Result{}, errors.Errorf("failed to delete router: %v", err)
196-
}
197-
r.Recorder.Eventf(openStackCluster, corev1.EventTypeNormal, "SuccessfulDeleteRouter", "Deleted router %s with id %s", router.Name, router.ID)
198-
log.Info("OpenStack router deleted successfully")
199-
}
200-
201192
// if NodeCIDR was not set, no network was created.
202193
if network := openStackCluster.Status.Network; network != nil && openStackCluster.Spec.NodeCIDR != "" {
194+
if router := network.Router; router != nil {
195+
log.Info("Deleting router", "name", router.Name)
196+
if err = networkingService.DeleteRouter(network); err != nil {
197+
return ctrl.Result{}, errors.Errorf("failed to delete router: %v", err)
198+
}
199+
r.Recorder.Eventf(openStackCluster, corev1.EventTypeNormal, "SuccessfulDeleteRouter", "Deleted router %s with id %s", router.Name, router.ID)
200+
log.Info("OpenStack router deleted successfully")
201+
}
202+
203203
log.Info("Deleting network", "name", network.Name)
204204
if err = networkingService.DeleteNetwork(network); err != nil {
205205
return ctrl.Result{}, errors.Errorf("failed to delete network: %v", err)

0 commit comments

Comments
 (0)