Skip to content

Commit b6d7748

Browse files
mdboothmdbooth
committed
Rename ClusterName to ClusterResourceName
1 parent 8017c89 commit b6d7748

File tree

14 files changed

+124
-122
lines changed

14 files changed

+124
-122
lines changed

‎controllers/openstackcluster_controller.go

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -148,13 +148,13 @@ func (r *OpenStackClusterReconciler) reconcileDelete(ctx context.Context, scope
148148
return ctrl.Result{RequeueAfter: 5 * time.Second}, nil
149149
}
150150

151-
clusterName := names.ClusterName(cluster)
151+
clusterResourceName := names.ClusterResourceName(cluster)
152152

153153
// A bastion may have been created if cluster initialisation previously reached populating the network status
154154
// We attempt to delete it even if no status was written, just in case
155155
if openStackCluster.Status.Network != nil {
156156
// Attempt to resolve bastion resources before delete. We don't need to worry about starting if the resources have changed on update.
157-
if _, err := resolveBastionResources(scope, clusterName, openStackCluster); err != nil {
157+
if _, err := resolveBastionResources(scope, clusterResourceName, openStackCluster); err != nil {
158158
return reconcile.Result{}, err
159159
}
160160

@@ -174,15 +174,15 @@ func (r *OpenStackClusterReconciler) reconcileDelete(ctx context.Context, scope
174174
return reconcile.Result{}, err
175175
}
176176

177-
if err = loadBalancerService.DeleteLoadBalancer(openStackCluster, clusterName); err != nil {
177+
if err = loadBalancerService.DeleteLoadBalancer(openStackCluster, clusterResourceName); err != nil {
178178
handleUpdateOSCError(openStackCluster, fmt.Errorf("failed to delete load balancer: %w", err))
179179
return reconcile.Result{}, fmt.Errorf("failed to delete load balancer: %w", err)
180180
}
181181
}
182182

183183
// if ManagedSubnets was not set, no network was created.
184184
if len(openStackCluster.Spec.ManagedSubnets) > 0 {
185-
if err = networkingService.DeleteRouter(openStackCluster, clusterName); err != nil {
185+
if err = networkingService.DeleteRouter(openStackCluster, clusterResourceName); err != nil {
186186
handleUpdateOSCError(openStackCluster, fmt.Errorf("failed to delete router: %w", err))
187187
return ctrl.Result{}, fmt.Errorf("failed to delete router: %w", err)
188188
}
@@ -192,13 +192,13 @@ func (r *OpenStackClusterReconciler) reconcileDelete(ctx context.Context, scope
192192
return reconcile.Result{}, fmt.Errorf("failed to delete ports: %w", err)
193193
}
194194

195-
if err = networkingService.DeleteNetwork(openStackCluster, clusterName); err != nil {
195+
if err = networkingService.DeleteNetwork(openStackCluster, clusterResourceName); err != nil {
196196
handleUpdateOSCError(openStackCluster, fmt.Errorf("failed to delete network: %w", err))
197197
return ctrl.Result{}, fmt.Errorf("failed to delete network: %w", err)
198198
}
199199
}
200200

201-
if err = networkingService.DeleteSecurityGroups(openStackCluster, clusterName); err != nil {
201+
if err = networkingService.DeleteSecurityGroups(openStackCluster, clusterResourceName); err != nil {
202202
handleUpdateOSCError(openStackCluster, fmt.Errorf("failed to delete security groups: %w", err))
203203
return reconcile.Result{}, fmt.Errorf("failed to delete security groups: %w", err)
204204
}
@@ -218,7 +218,7 @@ func contains(arr []string, target string) bool {
218218
return false
219219
}
220220

221-
func resolveBastionResources(scope *scope.WithLogger, clusterName string, openStackCluster *infrav1.OpenStackCluster) (bool, error) {
221+
func resolveBastionResources(scope *scope.WithLogger, clusterResourceName string, openStackCluster *infrav1.OpenStackCluster) (bool, error) {
222222
// Resolve and store referenced & dependent resources for the bastion
223223
if openStackCluster.Spec.Bastion != nil && openStackCluster.Spec.Bastion.Enabled {
224224
if openStackCluster.Status.Bastion == nil {
@@ -229,7 +229,7 @@ func resolveBastionResources(scope *scope.WithLogger, clusterName string, openSt
229229
}
230230
changed, err := compute.ResolveReferencedMachineResources(scope,
231231
openStackCluster.Spec.Bastion.Spec, &openStackCluster.Status.Bastion.ReferencedResources,
232-
clusterName, bastionName(clusterName),
232+
clusterResourceName, bastionName(clusterResourceName),
233233
openStackCluster, getBastionSecurityGroupID(openStackCluster))
234234
if err != nil {
235235
return false, err
@@ -387,8 +387,8 @@ func reconcileNormal(scope *scope.WithLogger, cluster *clusterv1.Cluster, openSt
387387
func reconcileBastion(scope *scope.WithLogger, cluster *clusterv1.Cluster, openStackCluster *infrav1.OpenStackCluster) (*ctrl.Result, error) {
388388
scope.Logger().V(4).Info("Reconciling Bastion")
389389

390-
clusterName := names.ClusterName(cluster)
391-
changed, err := resolveBastionResources(scope, clusterName, openStackCluster)
390+
clusterResourceName := names.ClusterResourceName(cluster)
391+
changed, err := resolveBastionResources(scope, clusterResourceName, openStackCluster)
392392
if err != nil {
393393
return nil, err
394394
}
@@ -491,10 +491,10 @@ func reconcileBastion(scope *scope.WithLogger, cluster *clusterv1.Cluster, openS
491491
return nil, err
492492
}
493493

494-
return bastionAddFloatingIP(openStackCluster, clusterName, port, networkingService)
494+
return bastionAddFloatingIP(openStackCluster, clusterResourceName, port, networkingService)
495495
}
496496

497-
func bastionAddFloatingIP(openStackCluster *infrav1.OpenStackCluster, clusterName string, port *ports.Port, networkingService *networking.Service) (*reconcile.Result, error) {
497+
func bastionAddFloatingIP(openStackCluster *infrav1.OpenStackCluster, clusterResourceName string, port *ports.Port, networkingService *networking.Service) (*reconcile.Result, error) {
498498
fp, err := networkingService.GetFloatingIPByPortID(port.ID)
499499
if err != nil {
500500
handleUpdateOSCError(openStackCluster, fmt.Errorf("failed to get or create floating IP for bastion: %w", err))
@@ -516,7 +516,7 @@ func bastionAddFloatingIP(openStackCluster *infrav1.OpenStackCluster, clusterNam
516516
floatingIP = openStackCluster.Spec.Bastion.FloatingIP
517517
}
518518
// Check if there is an existing floating IP attached to bastion, in case where FloatingIP would not yet have been stored in cluster status
519-
fp, err = networkingService.GetOrCreateFloatingIP(openStackCluster, openStackCluster, clusterName, floatingIP)
519+
fp, err = networkingService.GetOrCreateFloatingIP(openStackCluster, openStackCluster, clusterResourceName, floatingIP)
520520
if err != nil {
521521
handleUpdateOSCError(openStackCluster, fmt.Errorf("failed to get or create floating IP for bastion: %w", err))
522522
return nil, fmt.Errorf("failed to get or create floating IP for bastion: %w", err)
@@ -560,8 +560,8 @@ func bastionToInstanceSpec(openStackCluster *infrav1.OpenStackCluster, cluster *
560560
return instanceSpec, nil
561561
}
562562

563-
func bastionName(clusterName string) string {
564-
return fmt.Sprintf("%s-bastion", clusterName)
563+
func bastionName(clusterResourceName string) string {
564+
return fmt.Sprintf("%s-bastion", clusterResourceName)
565565
}
566566

567567
// getBastionSecurityGroupID returns the ID of the bastion security group if
@@ -603,7 +603,7 @@ func bastionHashHasChanged(computeHash string, clusterAnnotations map[string]str
603603
}
604604

605605
func reconcileNetworkComponents(scope *scope.WithLogger, cluster *clusterv1.Cluster, openStackCluster *infrav1.OpenStackCluster) error {
606-
clusterName := names.ClusterName(cluster)
606+
clusterResourceName := names.ClusterResourceName(cluster)
607607

608608
networkingService, err := networking.NewService(scope)
609609
if err != nil {
@@ -623,20 +623,20 @@ func reconcileNetworkComponents(scope *scope.WithLogger, cluster *clusterv1.Clus
623623
return err
624624
}
625625
} else if len(openStackCluster.Spec.ManagedSubnets) == 1 {
626-
if err := reconcileProvisionedNetworkComponents(networkingService, openStackCluster, clusterName); err != nil {
626+
if err := reconcileProvisionedNetworkComponents(networkingService, openStackCluster, clusterResourceName); err != nil {
627627
return err
628628
}
629629
} else {
630630
return fmt.Errorf("failed to reconcile network: ManagedSubnets only supports one element, %d provided", len(openStackCluster.Spec.ManagedSubnets))
631631
}
632632

633-
err = networkingService.ReconcileSecurityGroups(openStackCluster, clusterName)
633+
err = networkingService.ReconcileSecurityGroups(openStackCluster, clusterResourceName)
634634
if err != nil {
635635
handleUpdateOSCError(openStackCluster, fmt.Errorf("failed to reconcile security groups: %w", err))
636636
return fmt.Errorf("failed to reconcile security groups: %w", err)
637637
}
638638

639-
return reconcileControlPlaneEndpoint(scope, networkingService, openStackCluster, clusterName)
639+
return reconcileControlPlaneEndpoint(scope, networkingService, openStackCluster, clusterResourceName)
640640
}
641641

642642
// reconcilePreExistingNetworkComponents reconciles the cluster network status when the cluster is
@@ -700,18 +700,18 @@ func reconcilePreExistingNetworkComponents(scope *scope.WithLogger, networkingSe
700700
return nil
701701
}
702702

703-
func reconcileProvisionedNetworkComponents(networkingService *networking.Service, openStackCluster *infrav1.OpenStackCluster, clusterName string) error {
704-
err := networkingService.ReconcileNetwork(openStackCluster, clusterName)
703+
func reconcileProvisionedNetworkComponents(networkingService *networking.Service, openStackCluster *infrav1.OpenStackCluster, clusterResourceName string) error {
704+
err := networkingService.ReconcileNetwork(openStackCluster, clusterResourceName)
705705
if err != nil {
706706
handleUpdateOSCError(openStackCluster, fmt.Errorf("failed to reconcile network: %w", err))
707707
return fmt.Errorf("failed to reconcile network: %w", err)
708708
}
709-
err = networkingService.ReconcileSubnet(openStackCluster, clusterName)
709+
err = networkingService.ReconcileSubnet(openStackCluster, clusterResourceName)
710710
if err != nil {
711711
handleUpdateOSCError(openStackCluster, fmt.Errorf("failed to reconcile subnets: %w", err))
712712
return fmt.Errorf("failed to reconcile subnets: %w", err)
713713
}
714-
err = networkingService.ReconcileRouter(openStackCluster, clusterName)
714+
err = networkingService.ReconcileRouter(openStackCluster, clusterResourceName)
715715
if err != nil {
716716
handleUpdateOSCError(openStackCluster, fmt.Errorf("failed to reconcile router: %w", err))
717717
return fmt.Errorf("failed to reconcile router: %w", err)
@@ -723,7 +723,7 @@ func reconcileProvisionedNetworkComponents(networkingService *networking.Service
723723
// reconcileControlPlaneEndpoint configures the control plane endpoint for the
724724
// cluster, creating it if necessary, and updates ControlPlaneEndpoint in the
725725
// cluster spec.
726-
func reconcileControlPlaneEndpoint(scope *scope.WithLogger, networkingService *networking.Service, openStackCluster *infrav1.OpenStackCluster, clusterName string) error {
726+
func reconcileControlPlaneEndpoint(scope *scope.WithLogger, networkingService *networking.Service, openStackCluster *infrav1.OpenStackCluster, clusterResourceName string) error {
727727
// Calculate the port that we will use for the API server
728728
apiServerPort := getAPIServerPort(openStackCluster)
729729

@@ -740,7 +740,7 @@ func reconcileControlPlaneEndpoint(scope *scope.WithLogger, networkingService *n
740740
return err
741741
}
742742

743-
terminalFailure, err := loadBalancerService.ReconcileLoadBalancer(openStackCluster, clusterName, apiServerPort)
743+
terminalFailure, err := loadBalancerService.ReconcileLoadBalancer(openStackCluster, clusterResourceName, apiServerPort)
744744
if err != nil {
745745
// if it's terminalFailure (not Transient), set the Failure reason and message
746746
if terminalFailure {
@@ -765,7 +765,7 @@ func reconcileControlPlaneEndpoint(scope *scope.WithLogger, networkingService *n
765765
// API server load balancer is disabled, but floating IP is not. Create
766766
// a floating IP to be attached directly to a control plane host.
767767
case !pointer.BoolDeref(openStackCluster.Spec.DisableAPIServerFloatingIP, false):
768-
fp, err := networkingService.GetOrCreateFloatingIP(openStackCluster, openStackCluster, clusterName, openStackCluster.Spec.APIServerFloatingIP)
768+
fp, err := networkingService.GetOrCreateFloatingIP(openStackCluster, openStackCluster, clusterResourceName, openStackCluster.Spec.APIServerFloatingIP)
769769
if err != nil {
770770
handleUpdateOSCError(openStackCluster, fmt.Errorf("floating IP cannot be got or created: %w", err))
771771
return fmt.Errorf("floating IP cannot be got or created: %w", err)

‎controllers/openstackmachine_controller.go

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -150,22 +150,22 @@ func (r *OpenStackMachineReconciler) Reconcile(ctx context.Context, req ctrl.Req
150150
}
151151
scope := scope.NewWithLogger(clientScope, log)
152152

153-
clusterName := fmt.Sprintf("%s-%s", cluster.Namespace, cluster.Name)
153+
clusterResourceName := fmt.Sprintf("%s-%s", cluster.Namespace, cluster.Name)
154154

155155
// Handle deleted machines
156156
if !openStackMachine.DeletionTimestamp.IsZero() {
157-
return r.reconcileDelete(scope, clusterName, infraCluster, machine, openStackMachine)
157+
return r.reconcileDelete(scope, clusterResourceName, infraCluster, machine, openStackMachine)
158158
}
159159

160160
// Handle non-deleted clusters
161-
return r.reconcileNormal(ctx, scope, clusterName, infraCluster, machine, openStackMachine)
161+
return r.reconcileNormal(ctx, scope, clusterResourceName, infraCluster, machine, openStackMachine)
162162
}
163163

164-
func resolveMachineResources(scope *scope.WithLogger, clusterName string, openStackCluster *infrav1.OpenStackCluster, openStackMachine *infrav1.OpenStackMachine, machine *clusterv1.Machine) (bool, error) {
164+
func resolveMachineResources(scope *scope.WithLogger, clusterResourceName string, openStackCluster *infrav1.OpenStackCluster, openStackMachine *infrav1.OpenStackMachine, machine *clusterv1.Machine) (bool, error) {
165165
// Resolve and store referenced resources
166166
changed, err := compute.ResolveReferencedMachineResources(scope,
167167
&openStackMachine.Spec, &openStackMachine.Status.ReferencedResources,
168-
clusterName, openStackMachine.Name,
168+
clusterResourceName, openStackMachine.Name,
169169
openStackCluster, getManagedSecurityGroup(openStackCluster, machine))
170170
if err != nil {
171171
return false, err
@@ -231,7 +231,7 @@ func (r *OpenStackMachineReconciler) SetupWithManager(ctx context.Context, mgr c
231231
Complete(r)
232232
}
233233

234-
func (r *OpenStackMachineReconciler) reconcileDelete(scope *scope.WithLogger, clusterName string, openStackCluster *infrav1.OpenStackCluster, machine *clusterv1.Machine, openStackMachine *infrav1.OpenStackMachine) (ctrl.Result, error) { //nolint:unparam
234+
func (r *OpenStackMachineReconciler) reconcileDelete(scope *scope.WithLogger, clusterResourceName string, openStackCluster *infrav1.OpenStackCluster, machine *clusterv1.Machine, openStackMachine *infrav1.OpenStackMachine) (ctrl.Result, error) { //nolint:unparam
235235
scope.Logger().Info("Reconciling Machine delete")
236236

237237
computeService, err := compute.NewService(scope)
@@ -246,7 +246,7 @@ func (r *OpenStackMachineReconciler) reconcileDelete(scope *scope.WithLogger, cl
246246

247247
// We may have resources to adopt if the cluster is ready
248248
if openStackCluster.Status.Ready && openStackCluster.Status.Network != nil {
249-
if _, err := resolveMachineResources(scope, clusterName, openStackCluster, openStackMachine, machine); err != nil {
249+
if _, err := resolveMachineResources(scope, clusterResourceName, openStackCluster, openStackMachine, machine); err != nil {
250250
return ctrl.Result{}, err
251251
}
252252
}
@@ -257,7 +257,7 @@ func (r *OpenStackMachineReconciler) reconcileDelete(scope *scope.WithLogger, cl
257257
return ctrl.Result{}, err
258258
}
259259

260-
err = loadBalancerService.DeleteLoadBalancerMember(openStackCluster, machine, openStackMachine, clusterName)
260+
err = loadBalancerService.DeleteLoadBalancerMember(openStackCluster, machine, openStackMachine, clusterResourceName)
261261
if err != nil {
262262
conditions.MarkFalse(openStackMachine, infrav1.APIServerIngressReadyCondition, infrav1.LoadBalancerMemberErrorReason, clusterv1.ConditionSeverityWarning, "Machine could not be removed from load balancer: %v", err)
263263
return ctrl.Result{}, err
@@ -463,7 +463,7 @@ func (r *OpenStackMachineReconciler) reconcileDeleteFloatingAddressFromPool(scop
463463
return r.Client.Update(context.Background(), claim)
464464
}
465465

466-
func (r *OpenStackMachineReconciler) reconcileNormal(ctx context.Context, scope *scope.WithLogger, clusterName string, openStackCluster *infrav1.OpenStackCluster, machine *clusterv1.Machine, openStackMachine *infrav1.OpenStackMachine) (_ ctrl.Result, reterr error) {
466+
func (r *OpenStackMachineReconciler) reconcileNormal(ctx context.Context, scope *scope.WithLogger, clusterResourceName string, openStackCluster *infrav1.OpenStackCluster, machine *clusterv1.Machine, openStackMachine *infrav1.OpenStackMachine) (_ ctrl.Result, reterr error) {
467467
var err error
468468

469469
// If the OpenStackMachine is in an error state, return early.
@@ -484,7 +484,7 @@ func (r *OpenStackMachineReconciler) reconcileNormal(ctx context.Context, scope
484484
return ctrl.Result{RequeueAfter: waitForClusterInfrastructureReadyDuration}, nil
485485
}
486486

487-
if changed, err := resolveMachineResources(scope, clusterName, openStackCluster, openStackMachine, machine); changed || err != nil {
487+
if changed, err := resolveMachineResources(scope, clusterResourceName, openStackCluster, openStackMachine, machine); changed || err != nil {
488488
return ctrl.Result{}, err
489489
}
490490

@@ -597,7 +597,7 @@ func (r *OpenStackMachineReconciler) reconcileNormal(ctx context.Context, scope
597597
return ctrl.Result{}, nil
598598
}
599599

600-
err = r.reconcileAPIServerLoadBalancer(scope, openStackCluster, openStackMachine, instanceStatus, instanceNS, clusterName)
600+
err = r.reconcileAPIServerLoadBalancer(scope, openStackCluster, openStackMachine, instanceStatus, instanceNS, clusterResourceName)
601601
if err != nil {
602602
return ctrl.Result{}, err
603603
}
@@ -606,7 +606,7 @@ func (r *OpenStackMachineReconciler) reconcileNormal(ctx context.Context, scope
606606
return ctrl.Result{}, nil
607607
}
608608

609-
func (r *OpenStackMachineReconciler) reconcileAPIServerLoadBalancer(scope *scope.WithLogger, openStackCluster *infrav1.OpenStackCluster, openStackMachine *infrav1.OpenStackMachine, instanceStatus *compute.InstanceStatus, instanceNS *compute.InstanceNetworkStatus, clusterName string) error {
609+
func (r *OpenStackMachineReconciler) reconcileAPIServerLoadBalancer(scope *scope.WithLogger, openStackCluster *infrav1.OpenStackCluster, openStackMachine *infrav1.OpenStackMachine, instanceStatus *compute.InstanceStatus, instanceNS *compute.InstanceNetworkStatus, clusterResourceName string) error {
610610
scope.Logger().Info("Reconciling APIServerLoadBalancer")
611611
computeService, err := compute.NewService(scope)
612612
if err != nil {
@@ -619,7 +619,7 @@ func (r *OpenStackMachineReconciler) reconcileAPIServerLoadBalancer(scope *scope
619619
}
620620

621621
if openStackCluster.Spec.APIServerLoadBalancer.IsEnabled() {
622-
err = r.reconcileLoadBalancerMember(scope, openStackCluster, openStackMachine, instanceNS, clusterName)
622+
err = r.reconcileLoadBalancerMember(scope, openStackCluster, openStackMachine, instanceNS, clusterResourceName)
623623
if err != nil {
624624
conditions.MarkFalse(openStackMachine, infrav1.APIServerIngressReadyCondition, infrav1.LoadBalancerMemberErrorReason, clusterv1.ConditionSeverityError, "Reconciling load balancer member failed: %v", err)
625625
return fmt.Errorf("reconcile load balancer member: %w", err)
@@ -632,7 +632,7 @@ func (r *OpenStackMachineReconciler) reconcileAPIServerLoadBalancer(scope *scope
632632
case openStackCluster.Spec.APIServerFloatingIP != nil:
633633
floatingIPAddress = openStackCluster.Spec.APIServerFloatingIP
634634
}
635-
fp, err := networkingService.GetOrCreateFloatingIP(openStackMachine, openStackCluster, clusterName, floatingIPAddress)
635+
fp, err := networkingService.GetOrCreateFloatingIP(openStackMachine, openStackCluster, clusterResourceName, floatingIPAddress)
636636
if err != nil {
637637
conditions.MarkFalse(openStackMachine, infrav1.APIServerIngressReadyCondition, infrav1.FloatingIPErrorReason, clusterv1.ConditionSeverityError, "Floating IP cannot be obtained or created: %v", err)
638638
return fmt.Errorf("get or create floating IP %v: %w", floatingIPAddress, err)
@@ -759,14 +759,14 @@ func getManagedSecurityGroup(openStackCluster *infrav1.OpenStackCluster, machine
759759
return nil
760760
}
761761

762-
func (r *OpenStackMachineReconciler) reconcileLoadBalancerMember(scope *scope.WithLogger, openStackCluster *infrav1.OpenStackCluster, openStackMachine *infrav1.OpenStackMachine, instanceNS *compute.InstanceNetworkStatus, clusterName string) error {
762+
func (r *OpenStackMachineReconciler) reconcileLoadBalancerMember(scope *scope.WithLogger, openStackCluster *infrav1.OpenStackCluster, openStackMachine *infrav1.OpenStackMachine, instanceNS *compute.InstanceNetworkStatus, clusterResourceName string) error {
763763
ip := instanceNS.IP(openStackCluster.Status.Network.Name)
764764
loadbalancerService, err := loadbalancer.NewService(scope)
765765
if err != nil {
766766
return err
767767
}
768768

769-
return loadbalancerService.ReconcileLoadBalancerMember(openStackCluster, openStackMachine, clusterName, ip)
769+
return loadbalancerService.ReconcileLoadBalancerMember(openStackCluster, openStackMachine, clusterResourceName, ip)
770770
}
771771

772772
// OpenStackClusterToOpenStackMachines is a handler.ToRequestsFunc to be used to enqeue requests for reconciliation

0 commit comments

Comments
 (0)