Use Octavia (#426)

Author: hidekazuna

config/crds/openstackproviderconfig_v1alpha1_openstackclusterproviderspec.yaml

@@ -200,9 +200,13 @@ spec:
           items:
             type: string
           type: array
+        useOctavia:
+          description: UseOctavia is weather LoadBalancer Service is Octavia or not
+          type: boolean
       required:
       - cloudsSecret
       - cloudName
+      - useOctavia
       - managedAPIServerLoadBalancer
       - managedSecurityGroups
   version: v1alpha1

pkg/apis/openstackproviderconfig/v1alpha1/types.go

@@ -202,6 +202,8 @@ type OpenstackClusterProviderSpec struct {
 	// ExternalNetworkID is the ID of an external OpenStack Network. This is necessary
 	// to get public internet to the VMs.
 	ExternalNetworkID string `json:"externalNetworkId,omitempty"`
+	// UseOctavia is weather LoadBalancer Service is Octavia or not
+	UseOctavia bool `json:"useOctavia"`
 
 	// ManagedAPIServerLoadBalancer defines whether a LoadBalancer for the
 	// APIServer should be created. If set to true the following properties are

pkg/cloud/openstack/cluster/actuator.go

@@ -15,6 +15,7 @@ import (
 	"reflect"
 	providerv1 "sigs.k8s.io/cluster-api-provider-openstack/pkg/apis/openstackproviderconfig/v1alpha1"
 	"sigs.k8s.io/cluster-api-provider-openstack/pkg/cloud/openstack/services/certificates"
+	"sigs.k8s.io/cluster-api-provider-openstack/pkg/cloud/openstack/services/loadbalancer"
 	"sigs.k8s.io/cluster-api-provider-openstack/pkg/cloud/openstack/services/networking"
 	"sigs.k8s.io/cluster-api-provider-openstack/pkg/cloud/openstack/services/provider"
 	"sigs.k8s.io/cluster-api-provider-openstack/pkg/deployer"
@@ -78,6 +79,10 @@ func (a *Actuator) Reconcile(cluster *clusterv1.Cluster) error {
 	if err != nil {
 		return err
 	}
+	loadbalancerService, err := loadbalancer.NewService(osProviderClient, clientOpts, clusterProviderSpec.UseOctavia)
+	if err != nil {
+		return err
+	}
 
 	defer func() {
 		if err := a.storeCluster(cluster, clusterCopy, clusterProviderSpec, clusterProviderStatus); err != nil {
@@ -108,7 +113,7 @@ func (a *Actuator) Reconcile(cluster *clusterv1.Cluster) error {
 			return errors.Errorf("failed to reconcile router: %v", err)
 		}
 		if clusterProviderSpec.ManagedAPIServerLoadBalancer {
-			err = networkingService.ReconcileLoadBalancer(clusterName, clusterProviderSpec, clusterProviderStatus)
+			err = loadbalancerService.ReconcileLoadBalancer(clusterName, clusterProviderSpec, clusterProviderStatus)
 			if err != nil {
 				return errors.Errorf("failed to reconcile load balancer: %v", err)
 			}

pkg/cloud/openstack/machine/actuator.go

@@ -26,7 +26,7 @@ import (
 	"reflect"
 	constants "sigs.k8s.io/cluster-api-provider-openstack/pkg/cloud/openstack/contants"
 	"sigs.k8s.io/cluster-api-provider-openstack/pkg/cloud/openstack/services/compute"
-	"sigs.k8s.io/cluster-api-provider-openstack/pkg/cloud/openstack/services/networking"
+	"sigs.k8s.io/cluster-api-provider-openstack/pkg/cloud/openstack/services/loadbalancer"
 	"sigs.k8s.io/cluster-api-provider-openstack/pkg/cloud/openstack/services/provider"
 	"sigs.k8s.io/cluster-api-provider-openstack/pkg/cloud/openstack/services/userdata"
 	"sigs.k8s.io/cluster-api-provider-openstack/pkg/deployer"
@@ -96,11 +96,6 @@ func (a *Actuator) Create(ctx context.Context, cluster *clusterv1.Cluster, machi
 		return err
 	}
 
-	networkingService, err := networking.NewService(osProviderClient, clientOpts)
-	if err != nil {
-		return err
-	}
-
 	clusterProviderSpec, clusterProviderStatus, err := providerv1.ClusterSpecAndStatusFromProviderSpec(cluster)
 	if err != nil {
 		return a.handleMachineError(machine, apierrors.CreateMachine(
@@ -161,8 +156,12 @@ func (a *Actuator) Create(ctx context.Context, cluster *clusterv1.Cluster, machi
 		}
 	}
 
+	loadbalancerService, err := loadbalancer.NewService(osProviderClient, clientOpts, clusterProviderSpec.UseOctavia)
+	if err != nil {
+		return err
+	}
 	if clusterProviderSpec.ManagedAPIServerLoadBalancer {
-		err := networkingService.ReconcileLoadBalancerMember(clusterName, machine, clusterProviderSpec, clusterProviderStatus)
+		err := loadbalancerService.ReconcileLoadBalancerMember(clusterName, machine, clusterProviderSpec, clusterProviderStatus)
 		if err != nil {
 			return a.handleMachineError(machine, apierrors.CreateMachine(
 				"Reconcile LoadBalancer Member err: %v", err))
@@ -216,19 +215,18 @@ func (a *Actuator) Delete(ctx context.Context, cluster *clusterv1.Cluster, machi
 		return err
 	}
 
-	networkingService, err := networking.NewService(osProviderClient, clientOpts)
-	if err != nil {
-		return err
-	}
-
 	clusterProviderSpec, clusterProviderStatus, err := providerv1.ClusterSpecAndStatusFromProviderSpec(cluster)
 	if err != nil {
 		return a.handleMachineError(machine, apierrors.CreateMachine(
 			"error updating Openstack instance: %v", err))
 	}
 
+	loadbalancerService, err := loadbalancer.NewService(osProviderClient, clientOpts, clusterProviderSpec.UseOctavia)
+	if err != nil {
+		return err
+	}
 	if clusterProviderSpec.ManagedAPIServerLoadBalancer {
-		err = networkingService.DeleteLoadBalancerMember(clusterName, machine, clusterProviderStatus)
+		err = loadbalancerService.DeleteLoadBalancerMember(clusterName, machine, clusterProviderStatus)
 		if err != nil {
 			return err
 		}
@@ -268,11 +266,6 @@ func (a *Actuator) Update(ctx context.Context, cluster *clusterv1.Cluster, machi
 		return err
 	}
 
-	networkingService, err := networking.NewService(osProviderClient, clientOpts)
-	if err != nil {
-		return err
-	}
-
 	clusterProviderSpec, clusterProviderStatus, err := providerv1.ClusterSpecAndStatusFromProviderSpec(cluster)
 	if err != nil {
 		return a.handleMachineError(machine, apierrors.CreateMachine(
@@ -347,9 +340,13 @@ func (a *Actuator) Update(ctx context.Context, cluster *clusterv1.Cluster, machi
 			}
 		}
 	}
+	loadbalancerService, err := loadbalancer.NewService(osProviderClient, clientOpts, clusterProviderSpec.UseOctavia)
+	if err != nil {
+		return err
+	}
 
 	if clusterProviderSpec.ManagedAPIServerLoadBalancer {
-		err = networkingService.ReconcileLoadBalancerMember(clusterName, machine, clusterProviderSpec, clusterProviderStatus)
+		err = loadbalancerService.ReconcileLoadBalancerMember(clusterName, machine, clusterProviderSpec, clusterProviderStatus)
 		if err != nil {
 			return err
 		}