PCP-5217: WLC Worker node receives static IP from IPAM pool even though IPAM is configured only for control-plane (#232) (#233)

(cherry picked from commit 18b8b48)

Co-authored-by: Amit Sahastrabuddhe <[email protected]>

Author: github-actions[bot]

controllers/maasmachine_controller.go

@@ -343,11 +343,13 @@ func (r *MaasMachineReconciler) reconcileNormal(_ context.Context, machineScope
 		return ctrl.Result{}, nil
 	}
 
-	// If static IP is configured, make sure the IP field is populated by external controller.
-	if staticIPConfig := machineScope.GetStaticIPConfig(); staticIPConfig != nil && machineScope.GetStaticIP() == "" {
-		machineScope.Info("Static IP is configured but IP field is empty, waiting for external controller to populate it")
-		conditions.MarkFalse(machineScope.MaasMachine, infrav1beta1.MachineDeployedCondition, infrav1beta1.WaitingForStaticIPReason, clusterv1.ConditionSeverityInfo, "")
-		return ctrl.Result{RequeueAfter: 30 * time.Second}, nil
+	// If control-plane static IP is configured, wait for IP assignment to be populated by external controller.
+	if machineScope.IsControlPlane() {
+		if staticIPConfig := machineScope.GetStaticIPConfig(); staticIPConfig != nil && machineScope.GetStaticIP() == "" {
+			machineScope.Info("Static IP is configured for control-plane but IP field is empty, waiting for external controller to populate it")
+			conditions.MarkFalse(machineScope.MaasMachine, infrav1beta1.MachineDeployedCondition, infrav1beta1.WaitingForStaticIPReason, clusterv1.ConditionSeverityInfo, "")
+			return ctrl.Result{RequeueAfter: 30 * time.Second}, nil
+		}
 	}
 
 	machineSvc := maasmachine.NewService(machineScope)

pkg/maas/lxd/service.go

@@ -187,4 +187,4 @@ func (s *Service) isNodeLXDInitialized(machine *v1beta1.MaasMachine) (bool, erro
 
 	value, exists := node.Labels[LXDHostInitializedLabel]
 	return exists && value == "true", nil
-}
+}

pkg/maas/machine/machine.go

@@ -236,13 +236,15 @@ func (s *Service) DeployMachine(userDataB64 string) (_ *infrav1beta1.Machine, re
 
 	s.scope.Info("Swap disabled", "system-id", m.SystemID())
 
-	// Configure static IP before deployment
-	if staticIP := s.scope.GetStaticIP(); staticIP != "" {
-		staticIPConfig := s.scope.GetStaticIPConfig()
-		if staticIPConfig != nil {
-			err := s.setMachineStaticIP(m.SystemID(), staticIPConfig)
-			if err != nil {
-				return nil, errors.Wrapf(err, "failed to configure static IP")
+	// Configure static IP before deployment (control-plane only)
+	if s.scope.IsControlPlane() {
+		if staticIP := s.scope.GetStaticIP(); staticIP != "" {
+			staticIPConfig := s.scope.GetStaticIPConfig()
+			if staticIPConfig != nil {
+				err := s.setMachineStaticIP(m.SystemID(), staticIPConfig)
+				if err != nil {
+					return nil, errors.Wrapf(err, "failed to configure static IP")
+				}
 			}
 		}
 	}
@@ -276,10 +278,12 @@ func (s *Service) createVMViaMAAS(ctx context.Context, userDataB64 string) (*inf
 		machineName := s.scope.Machine.Name
 		vmName := fmt.Sprintf("vm-%s", machineName)
 		_, _ = m.Modifier().SetHostname(vmName).Update(ctx)
-		if staticIP := s.scope.GetStaticIP(); staticIP != "" {
-			if err := s.setMachineStaticIP(m.SystemID(), &infrav1beta1.StaticIPConfig{IP: staticIP}); err != nil {
-				// Fail fast so we don't attempt Deploy without a network link configured
-				return nil, errors.Wrap(err, "failed to configure static IP before deploy")
+		if s.scope.IsControlPlane() {
+			if staticIP := s.scope.GetStaticIP(); staticIP != "" {
+				if err := s.setMachineStaticIP(m.SystemID(), &infrav1beta1.StaticIPConfig{IP: staticIP}); err != nil {
+					// Fail fast so we don't attempt Deploy without a network link configured
+					return nil, errors.Wrap(err, "failed to configure static IP before deploy")
+				}
 			}
 		}
 		deployingM, err := m.Deployer().