Skip to content

Commit 56351bc

Browse files
committed
controllers: replace context.TODO with real context objects
Signed-off-by: Schlotter, Christian <[email protected]>
1 parent 1be73ec commit 56351bc

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

controllers/openstackmachine_controller.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ func (r *OpenStackMachineReconciler) reconcileNormal(ctx context.Context, logger
282282
logger.Info("Bootstrap data secret reference is not yet available")
283283
return ctrl.Result{}, nil
284284
}
285-
userData, err := r.getBootstrapData(machine, openStackMachine)
285+
userData, err := r.getBootstrapData(ctx, machine, openStackMachine)
286286
if err != nil {
287287
return ctrl.Result{}, err
288288
}
@@ -440,7 +440,7 @@ func (r *OpenStackMachineReconciler) OpenStackClusterToOpenStackMachines(ctx con
440440
return nil
441441
}
442442

443-
cluster, err := util.GetOwnerCluster(context.TODO(), r.Client, c.ObjectMeta)
443+
cluster, err := util.GetOwnerCluster(ctx, r.Client, c.ObjectMeta)
444444
switch {
445445
case apierrors.IsNotFound(err) || cluster == nil:
446446
log.V(4).Info("Cluster for OpenStackCluster not found, skipping mapping.")
@@ -450,18 +450,18 @@ func (r *OpenStackMachineReconciler) OpenStackClusterToOpenStackMachines(ctx con
450450
return nil
451451
}
452452

453-
return r.requestsForCluster(log, cluster.Namespace, cluster.Name)
453+
return r.requestsForCluster(ctx, log, cluster.Namespace, cluster.Name)
454454
}
455455
}
456456

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) {
458458
if machine.Spec.Bootstrap.DataSecretName == nil {
459459
return "", errors.New("error retrieving bootstrap data: linked Machine's bootstrap.dataSecretName is nil")
460460
}
461461

462462
secret := &corev1.Secret{}
463463
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 {
465465
return "", errors.Wrapf(err, "failed to retrieve bootstrap data secret for Openstack Machine %s/%s", machine.Namespace, openStackMachine.Name)
466466
}
467467

@@ -489,14 +489,14 @@ func (r *OpenStackMachineReconciler) requeueOpenStackMachinesForUnpausedCluster(
489489
return nil
490490
}
491491

492-
return r.requestsForCluster(log, c.Namespace, c.Name)
492+
return r.requestsForCluster(ctx, log, c.Namespace, c.Name)
493493
}
494494
}
495495

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 {
497497
labels := map[string]string{clusterv1.ClusterLabelName: name}
498498
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 {
500500
log.Error(err, "Failed to get owned Machines, skipping mapping.")
501501
return nil
502502
}

0 commit comments

Comments
 (0)