Support public clusters

Author: Tomy2e

api/v1beta1/scalewaycluster_webhook.go

@@ -267,6 +267,14 @@ func (r *ScalewayCluster) enforceImmutability(old *ScalewayCluster) error {
 		allErrs = append(allErrs, field.Invalid(field.NewPath("spec", "scalewaySecretName"), r.Spec.ScalewaySecretName, "field is immutable"))
 	}
 
+	if r.Spec.Network == nil {
+		r.Spec.Network = &NetworkSpec{}
+	}
+
+	if old.Spec.Network == nil {
+		old.Spec.Network = &NetworkSpec{}
+	}
+
 	if !reflect.DeepEqual(r.Spec.Network.PrivateNetwork, old.Spec.Network.PrivateNetwork) {
 		allErrs = append(allErrs, field.Invalid(field.NewPath("spec", "network", "privateNetwork"), r.Spec.Network.PrivateNetwork, "field is immutable"))
 	}

internal/service/scaleway/instance/instance.go

@@ -25,6 +25,8 @@ var (
 	ErrInstanceNotStoppedYet = errors.New("instance is being stopped")
 )
 
+var errMachineHasNoIP = errors.New("machine has no IP")
+
 type Service struct {
 	*scope.Machine
 }
@@ -203,7 +205,7 @@ func (s *Service) getMachineIPs(ctx context.Context, server *instance.Server, pn
 	}
 
 	if m.External == nil && m.Internal == nil {
-		return nil, errors.New("machine has no IP")
+		return nil, errMachineHasNoIP
 	}
 
 	return m, nil
@@ -344,15 +346,9 @@ func (s *Service) ensureLoadBalancerACL(ctx context.Context, publicIP *string) e
 	return nil
 }
 
-func (s *Service) ensureControlPlaneLoadBalancer(ctx context.Context, server *instance.Server, pnic *instance.PrivateNIC, deletion bool) (*machineIPs, error) {
-	// TODO: getMachineIPs out of this method
-	ips, err := s.getMachineIPs(ctx, server, pnic)
-	if err != nil {
-		return nil, err
-	}
-
+func (s *Service) ensureControlPlaneLoadBalancer(ctx context.Context, server *instance.Server, pnic *instance.PrivateNIC, ips *machineIPs, deletion bool) error {
 	if !util.IsControlPlaneMachine(s.Machine.Machine) {
-		return ips, nil
+		return nil
 	}
 
 	backend, err := s.ScalewayClient.FindLoadBalancerBackendByNames(
@@ -362,7 +358,7 @@ func (s *Service) ensureControlPlaneLoadBalancer(ctx context.Context, server *in
 		loadbalancer.ControlPlaneBackendName,
 	)
 	if err != nil {
-		return nil, fmt.Errorf("failed to find load balancer backend: %w", err)
+		return fmt.Errorf("failed to find load balancer backend: %w", err)
 	}
 
 	switch {
@@ -373,7 +369,7 @@ func (s *Service) ensureControlPlaneLoadBalancer(ctx context.Context, server *in
 				BackendID: backend.ID,
 				ServerIP:  []string{ips.NodeIP()},
 			}); err != nil {
-				return nil, err
+				return err
 			}
 		}
 	case !deletion && !slices.Contains(backend.Pool, ips.NodeIP()):
@@ -382,11 +378,11 @@ func (s *Service) ensureControlPlaneLoadBalancer(ctx context.Context, server *in
 			BackendID: backend.ID,
 			ServerIP:  []string{ips.NodeIP()},
 		}); err != nil {
-			return nil, err
+			return err
 		}
 	}
 
-	return ips, nil
+	return nil
 }
 
 func (s *Service) Reconcile(ctx context.Context) error {
@@ -405,11 +401,15 @@ func (s *Service) Reconcile(ctx context.Context) error {
 		return err
 	}
 
-	machineIPs, err := s.ensureControlPlaneLoadBalancer(ctx, server, pnic, false)
+	machineIPs, err := s.getMachineIPs(ctx, server, pnic)
 	if err != nil {
 		return err
 	}
 
+	if err := s.ensureControlPlaneLoadBalancer(ctx, server, pnic, machineIPs, false); err != nil {
+		return err
+	}
+
 	if err := s.ensureLoadBalancerACL(ctx, machineIPs.External); err != nil {
 		return err
 	}
@@ -474,9 +474,16 @@ func (s *Service) Delete(ctx context.Context) error {
 			}
 		}
 
-		_, err := s.ensureControlPlaneLoadBalancer(ctx, server, pnic, true)
-		if err != nil && !errors.Is(err, client.ErrNoItemFound) {
-			return err
+		machineIPs, err := s.getMachineIPs(ctx, server, pnic)
+		if err != nil && !errors.Is(err, errMachineHasNoIP) {
+			return fmt.Errorf("failed to get machine IPs for control-plane machine: %w", err)
+		}
+
+		if machineIPs != nil {
+			err = s.ensureControlPlaneLoadBalancer(ctx, server, pnic, machineIPs, true)
+			if err != nil && !errors.Is(err, client.ErrNoItemFound) {
+				return err
+			}
 		}
 	}
 

internal/service/scaleway/loadbalancer/loadbalancer.go

@@ -66,8 +66,8 @@ func (s *Service) getOrCreateLB(ctx context.Context, zone scw.Zone) (*lb.LB, err
 	return loadbalancer, nil
 }
 
-func (s *Service) ensurePrivateNetwork(ctx context.Context, loadbalancer *lb.LB, pnID string) error {
-	if !s.HasPrivateNetwork() {
+func (s *Service) ensurePrivateNetwork(ctx context.Context, loadbalancer *lb.LB, pnID *string) error {
+	if pnID == nil {
 		return nil
 	}
 
@@ -80,14 +80,14 @@ func (s *Service) ensurePrivateNetwork(ctx context.Context, loadbalancer *lb.LB,
 	}
 
 	found := slices.IndexFunc(lbPNs.PrivateNetwork, func(lbPN *lb.PrivateNetwork) bool {
-		return lbPN.PrivateNetworkID == pnID
+		return lbPN.PrivateNetworkID == *pnID
 	})
 
 	if found == -1 {
 		if _, err := s.ScalewayClient.LoadBalancer.AttachPrivateNetwork(&lb.ZonedAPIAttachPrivateNetworkRequest{
 			Zone:             loadbalancer.Zone,
 			LBID:             loadbalancer.ID,
-			PrivateNetworkID: pnID,
+			PrivateNetworkID: *pnID,
 			IpamConfig:       &lb.PrivateNetworkIpamConfig{},
 		}, scw.WithContext(ctx)); err != nil {
 			return err
@@ -239,7 +239,7 @@ func (s *Service) ensureACL(ctx context.Context, frontendID, name string, ips []
 	return nil
 }
 
-func (s *Service) ensureACLs(ctx context.Context, frontend *lb.Frontend, pnID string) error {
+func (s *Service) ensureACLs(ctx context.Context, frontend *lb.Frontend, pnID *string) error {
 	// Set the Allowed Ranges ACL.
 	var (
 		allowedRanges []string
@@ -256,8 +256,8 @@ func (s *Service) ensureACLs(ctx context.Context, frontend *lb.Frontend, pnID st
 	}
 
 	// Set the Public Gateway ACL.
-	if s.HasPrivateNetwork() {
-		gws, err := s.ScalewayClient.FindGatewaysByPrivateNetworkID(ctx, s.Zones(s.ScalewayClient.VPCGW.Zones()), pnID)
+	if pnID != nil && s.HasPrivateNetwork() {
+		gws, err := s.ScalewayClient.FindGatewaysByPrivateNetworkID(ctx, s.Zones(s.ScalewayClient.VPCGW.Zones()), *pnID)
 		if err != nil {
 			return err
 		}
@@ -294,9 +294,15 @@ func (s *Service) Reconcile(ctx context.Context) error {
 		return ErrLoadBalancerNotReady
 	}
 
-	pnID, err := s.PrivateNetworkID()
-	if err != nil {
-		return err
+	var pnID *string
+
+	if s.HasPrivateNetwork() {
+		tmpPNID, err := s.PrivateNetworkID()
+		if err != nil {
+			return err
+		}
+
+		pnID = &tmpPNID
 	}
 
 	if err := s.ensurePrivateNetwork(ctx, loadbalancer, pnID); err != nil {