Update controllers/openstackcluster_controller.go

anders-elastisys · alexandrevilain · k8s-infra-cherrypick-robot · commit a12c44c97189 · 2025-03-17T18:44:25.000Z
Co-authored-by: Alexandre Vilain &lt;alexandrevilain@users.noreply.github.com&gt;
diff --git a/controllers/openstackcluster_controller.go b/controllers/openstackcluster_controller.go
@@ -253,7 +253,7 @@ func (r *OpenStackClusterReconciler) deleteBastion(ctx context.Context, scope *s
 	if openStackCluster.Status.Bastion != nil && openStackCluster.Status.Bastion.FloatingIP != "" {
 		statusFloatingIP = &openStackCluster.Status.Bastion.FloatingIP
 	}
-	if openStackCluster.Spec.Bastion.FloatingIP != nil {
+	if openStackCluster.Spec.Bastion != nil && openStackCluster.Spec.Bastion.FloatingIP != nil {
 		specFloatingIP = openStackCluster.Spec.Bastion.FloatingIP
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -253,7 +253,7 @@ func (r OpenStackClusterReconciler) deleteBastion(ctx context.Context, scope s`
`253`	`253`	`if openStackCluster.Status.Bastion != nil && openStackCluster.Status.Bastion.FloatingIP != "" {`
`254`	`254`	`statusFloatingIP = &openStackCluster.Status.Bastion.FloatingIP`
`255`	`255`	`}`
`256`		`- if openStackCluster.Spec.Bastion.FloatingIP != nil {`
	`256`	`+ if openStackCluster.Spec.Bastion != nil && openStackCluster.Spec.Bastion.FloatingIP != nil {`
`257`	`257`	`specFloatingIP = openStackCluster.Spec.Bastion.FloatingIP`
`258`	`258`	`}`
`259`	`259`