optional manila endpoint (#1190)

Author: kon-angelo

pkg/controller/infrastructure/infraflow/context.go

@@ -77,17 +77,17 @@ type Opts struct {
 
 // FlowContext contains the logic to reconcile or delete the infrastructure.
 type FlowContext struct {
-	state              shared.Whiteboard
-	client             client.Client
-	log                logr.Logger
-	infra              *extensionsv1alpha1.Infrastructure
-	config             *openstackapi.InfrastructureConfig
-	cloudProfileConfig *openstackapi.CloudProfileConfig
-	networking         osclient.Networking
-	loadbalancing      osclient.Loadbalancing
-	sharedFilesystem   osclient.SharedFilesystem
-	access             access.NetworkingAccess
-	compute            osclient.Compute
+	state                  shared.Whiteboard
+	client                 client.Client
+	openstackClientFactory osclient.Factory
+	log                    logr.Logger
+	infra                  *extensionsv1alpha1.Infrastructure
+	config                 *openstackapi.InfrastructureConfig
+	cloudProfileConfig     *openstackapi.CloudProfileConfig
+	networking             osclient.Networking
+	loadbalancing          osclient.Loadbalancing
+	access                 access.NetworkingAccess
+	compute                osclient.Compute
 
 	*shared.BasicFlowContext
 }
@@ -115,11 +115,6 @@ func NewFlowContext(opts Opts) (*FlowContext, error) {
 	if err != nil {
 		return nil, err
 	}
-	sharedFilesytem, err := opts.ClientFactory.SharedFilesystem(osclient.WithRegion(opts.Infrastructure.Spec.Region))
-	if err != nil {
-		return nil, err
-	}
-
 	infraConfig, err := helper.InfrastructureConfigFromInfrastructure(opts.Infrastructure)
 	if err != nil {
 		return nil, err
@@ -130,17 +125,17 @@ func NewFlowContext(opts Opts) (*FlowContext, error) {
 	}
 
 	flowContext := &FlowContext{
-		state:              whiteboard,
-		infra:              opts.Infrastructure,
-		config:             infraConfig,
-		cloudProfileConfig: cloudProfileConfig,
-		networking:         networking,
-		loadbalancing:      loadbalancing,
-		access:             access,
-		compute:            compute,
-		sharedFilesystem:   sharedFilesytem,
-		log:                opts.Log,
-		client:             opts.Client,
+		state:                  whiteboard,
+		infra:                  opts.Infrastructure,
+		config:                 infraConfig,
+		cloudProfileConfig:     cloudProfileConfig,
+		networking:             networking,
+		loadbalancing:          loadbalancing,
+		access:                 access,
+		compute:                compute,
+		log:                    opts.Log,
+		client:                 opts.Client,
+		openstackClientFactory: opts.ClientFactory,
 	}
 	return flowContext, nil
 }

pkg/controller/infrastructure/infraflow/delete.go

@@ -251,14 +251,19 @@ func (fctx *FlowContext) deleteShareNetwork(ctx context.Context) error {
 		return nil
 	}
 
+	sharedFilesystemClient, err := fctx.openstackClientFactory.SharedFilesystem(client.WithRegion(fctx.infra.Spec.Region))
+	if err != nil {
+		return err
+	}
+
 	log := shared.LogFromContext(ctx)
 	networkID := ptr.Deref(fctx.state.Get(IdentifierNetwork), "")
 	subnetID := ptr.Deref(fctx.state.Get(IdentifierSubnet), "")
 	current, err := findExisting(ctx, fctx.state.Get(IdentifierShareNetwork),
 		fctx.defaultSharedNetworkName(),
-		fctx.sharedFilesystem.GetShareNetwork,
+		sharedFilesystemClient.GetShareNetwork,
 		func(ctx context.Context, name string) ([]*sharenetworks.ShareNetwork, error) {
-			list, err := fctx.sharedFilesystem.ListShareNetworks(ctx, sharenetworks.ListOpts{
+			list, err := sharedFilesystemClient.ListShareNetworks(ctx, sharenetworks.ListOpts{
 				Name:            name,
 				NeutronNetID:    networkID,
 				NeutronSubnetID: subnetID,
@@ -273,7 +278,7 @@ func (fctx *FlowContext) deleteShareNetwork(ctx context.Context) error {
 	}
 	if current != nil {
 		log.Info("deleting...", "shareNetwork", current.ID)
-		if err := fctx.sharedFilesystem.DeleteShareNetwork(ctx, current.ID); client.IgnoreNotFoundError(err) != nil {
+		if err := sharedFilesystemClient.DeleteShareNetwork(ctx, current.ID); client.IgnoreNotFoundError(err) != nil {
 			return err
 		}
 	}

pkg/controller/infrastructure/infraflow/reconcile.go

@@ -477,14 +477,19 @@ func (fctx *FlowContext) ensureShareNetwork(ctx context.Context) error {
 		return nil
 	}
 
+	sharedFilesystemClient, err := fctx.openstackClientFactory.SharedFilesystem(client.WithRegion(fctx.infra.Spec.Region))
+	if err != nil {
+		return err
+	}
+
 	log := shared.LogFromContext(ctx)
 	networkID := ptr.Deref(fctx.state.Get(IdentifierNetwork), "")
 	subnetID := ptr.Deref(fctx.state.Get(IdentifierSubnet), "")
 	current, err := findExisting(ctx, fctx.state.Get(IdentifierShareNetwork),
 		fctx.defaultSharedNetworkName(),
-		fctx.sharedFilesystem.GetShareNetwork,
+		sharedFilesystemClient.GetShareNetwork,
 		func(ctx context.Context, name string) ([]*sharenetworks.ShareNetwork, error) {
-			list, err := fctx.sharedFilesystem.ListShareNetworks(ctx, sharenetworks.ListOpts{
+			list, err := sharedFilesystemClient.ListShareNetworks(ctx, sharenetworks.ListOpts{
 				Name:            name,
 				NeutronNetID:    networkID,
 				NeutronSubnetID: subnetID,
@@ -506,7 +511,7 @@ func (fctx *FlowContext) ensureShareNetwork(ctx context.Context) error {
 	}
 
 	log.Info("creating...")
-	created, err := fctx.sharedFilesystem.CreateShareNetwork(ctx, sharenetworks.CreateOpts{
+	created, err := sharedFilesystemClient.CreateShareNetwork(ctx, sharenetworks.CreateOpts{
 		NeutronNetID:    networkID,
 		NeutronSubnetID: subnetID,
 		Name:            fctx.defaultSharedNetworkName(),