@@ -282,7 +282,7 @@ func (r *OpenStackMachineReconciler) reconcileNormal(ctx context.Context, logger
282
282
logger .Info ("Bootstrap data secret reference is not yet available" )
283
283
return ctrl.Result {}, nil
284
284
}
285
- userData , err := r .getBootstrapData (machine , openStackMachine )
285
+ userData , err := r .getBootstrapData (ctx , machine , openStackMachine )
286
286
if err != nil {
287
287
return ctrl.Result {}, err
288
288
}
@@ -440,7 +440,7 @@ func (r *OpenStackMachineReconciler) OpenStackClusterToOpenStackMachines(ctx con
440
440
return nil
441
441
}
442
442
443
- cluster , err := util .GetOwnerCluster (context . TODO () , r .Client , c .ObjectMeta )
443
+ cluster , err := util .GetOwnerCluster (ctx , r .Client , c .ObjectMeta )
444
444
switch {
445
445
case apierrors .IsNotFound (err ) || cluster == nil :
446
446
log .V (4 ).Info ("Cluster for OpenStackCluster not found, skipping mapping." )
@@ -450,18 +450,18 @@ func (r *OpenStackMachineReconciler) OpenStackClusterToOpenStackMachines(ctx con
450
450
return nil
451
451
}
452
452
453
- return r .requestsForCluster (log , cluster .Namespace , cluster .Name )
453
+ return r .requestsForCluster (ctx , log , cluster .Namespace , cluster .Name )
454
454
}
455
455
}
456
456
457
- func (r * OpenStackMachineReconciler ) getBootstrapData (machine * clusterv1.Machine , openStackMachine * infrav1.OpenStackMachine ) (string , error ) {
457
+ func (r * OpenStackMachineReconciler ) getBootstrapData (ctx context. Context , machine * clusterv1.Machine , openStackMachine * infrav1.OpenStackMachine ) (string , error ) {
458
458
if machine .Spec .Bootstrap .DataSecretName == nil {
459
459
return "" , errors .New ("error retrieving bootstrap data: linked Machine's bootstrap.dataSecretName is nil" )
460
460
}
461
461
462
462
secret := & corev1.Secret {}
463
463
key := types.NamespacedName {Namespace : machine .Namespace , Name : * machine .Spec .Bootstrap .DataSecretName }
464
- if err := r .Client .Get (context . TODO () , key , secret ); err != nil {
464
+ if err := r .Client .Get (ctx , key , secret ); err != nil {
465
465
return "" , errors .Wrapf (err , "failed to retrieve bootstrap data secret for Openstack Machine %s/%s" , machine .Namespace , openStackMachine .Name )
466
466
}
467
467
@@ -489,14 +489,14 @@ func (r *OpenStackMachineReconciler) requeueOpenStackMachinesForUnpausedCluster(
489
489
return nil
490
490
}
491
491
492
- return r .requestsForCluster (log , c .Namespace , c .Name )
492
+ return r .requestsForCluster (ctx , log , c .Namespace , c .Name )
493
493
}
494
494
}
495
495
496
- func (r * OpenStackMachineReconciler ) requestsForCluster (log logr.Logger , namespace , name string ) []ctrl.Request {
496
+ func (r * OpenStackMachineReconciler ) requestsForCluster (ctx context. Context , log logr.Logger , namespace , name string ) []ctrl.Request {
497
497
labels := map [string ]string {clusterv1 .ClusterLabelName : name }
498
498
machineList := & clusterv1.MachineList {}
499
- if err := r .Client .List (context . TODO () , machineList , client .InNamespace (namespace ), client .MatchingLabels (labels )); err != nil {
499
+ if err := r .Client .List (ctx , machineList , client .InNamespace (namespace ), client .MatchingLabels (labels )); err != nil {
500
500
log .Error (err , "Failed to get owned Machines, skipping mapping." )
501
501
return nil
502
502
}
0 commit comments