Add missing check to get init functionality working

huxcrux · mikaelgron · commit 218c3db81b7d · 2023-10-16T15:14:51.000+02:00
diff --git a/controllers/openstackmachine_controller.go b/controllers/openstackmachine_controller.go
@@ -434,7 +434,8 @@ func (r *OpenStackMachineReconciler) reconcileNormal(ctx context.Context, scope
 	}
 	conditions.MarkTrue(openStackMachine, infrav1.APIServerIngressReadyCondition)
 
-	if openStackCluster.Spec.WorkerFloatingIPConfig.Enabled {
+	// Apply floating ip on worker if enabled in openStackCluster spec
+	if !util.IsControlPlaneMachine(machine) && openStackCluster.Spec.WorkerFloatingIPConfig.Enabled {
 		scope.Logger().Info("Processing worker floating IPs")
 		for _, floatingIP := range openStackCluster.Spec.WorkerFloatingIPConfig.IPAddresses {
 			fp, err := networkingService.GetOrCreateFloatingIP(openStackMachine, openStackCluster, clusterName, floatingIP)

Original file line number	Diff line number	Diff line change
`@@ -434,7 +434,8 @@ func (r *OpenStackMachineReconciler) reconcileNormal(ctx context.Context, scope`
`434`	`434`	`}`
`435`	`435`	`conditions.MarkTrue(openStackMachine, infrav1.APIServerIngressReadyCondition)`
`436`	`436`
`437`		`- if openStackCluster.Spec.WorkerFloatingIPConfig.Enabled {`
	`437`	`+ // Apply floating ip on worker if enabled in openStackCluster spec`
	`438`	`+ if !util.IsControlPlaneMachine(machine) && openStackCluster.Spec.WorkerFloatingIPConfig.Enabled {`
`438`	`439`	`scope.Logger().Info("Processing worker floating IPs")`
`439`	`440`	`for _, floatingIP := range openStackCluster.Spec.WorkerFloatingIPConfig.IPAddresses {`
`440`	`441`	`fp, err := networkingService.GetOrCreateFloatingIP(openStackMachine, openStackCluster, clusterName, floatingIP)`