Merge pull request #1657 from shiftstack/issue1654

🐛 Fix panic on delete before cluster is initialised
kubernetes-sigs · Sep 8, 2023 · 022e20c · 022e20c
2 parents cc25810 + 500cef6
commit 022e20c
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/controllers/openstackmachine_controller.go b/controllers/openstackmachine_controller.go
@@ -492,9 +492,9 @@ func machineToInstanceSpec(openStackCluster *infrav1.OpenStackCluster, machine *
 	instanceSpec.SecurityGroups = openStackMachine.Spec.SecurityGroups
 	if openStackCluster.Spec.ManagedSecurityGroups {
 		var managedSecurityGroup string
-		if util.IsControlPlaneMachine(machine) {
+		if util.IsControlPlaneMachine(machine) && openStackCluster.Status.ControlPlaneSecurityGroup != nil {
 			managedSecurityGroup = openStackCluster.Status.ControlPlaneSecurityGroup.ID
-		} else {
+		} else if openStackCluster.Status.WorkerSecurityGroup != nil {
 			managedSecurityGroup = openStackCluster.Status.WorkerSecurityGroup.ID
 		}