Skip to content

Commit 650ce1c

Browse files
authored
Merge pull request #1019 from Daimler/schloc/controllers-fix-context-todo
✨ controllers: replace context.TODO with real context objects
2 parents 5df4126 + 56351bc commit 650ce1c

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
@@ -281,7 +281,7 @@ func (r *OpenStackMachineReconciler) reconcileNormal(ctx context.Context, logger
281281
logger.Info("Bootstrap data secret reference is not yet available")
282282
return ctrl.Result{}, nil
283283
}
284-
userData, err := r.getBootstrapData(machine, openStackMachine)
284+
userData, err := r.getBootstrapData(ctx, machine, openStackMachine)
285285
if err != nil {
286286
return ctrl.Result{}, err
287287
}
@@ -436,7 +436,7 @@ func (r *OpenStackMachineReconciler) OpenStackClusterToOpenStackMachines(ctx con
436436
return nil
437437
}
438438

439-
cluster, err := util.GetOwnerCluster(context.TODO(), r.Client, c.ObjectMeta)
439+
cluster, err := util.GetOwnerCluster(ctx, r.Client, c.ObjectMeta)
440440
switch {
441441
case apierrors.IsNotFound(err) || cluster == nil:
442442
log.V(4).Info("Cluster for OpenStackCluster not found, skipping mapping.")
@@ -446,18 +446,18 @@ func (r *OpenStackMachineReconciler) OpenStackClusterToOpenStackMachines(ctx con
446446
return nil
447447
}
448448

449-
return r.requestsForCluster(log, cluster.Namespace, cluster.Name)
449+
return r.requestsForCluster(ctx, log, cluster.Namespace, cluster.Name)
450450
}
451451
}
452452

453-
func (r *OpenStackMachineReconciler) getBootstrapData(machine *clusterv1.Machine, openStackMachine *infrav1.OpenStackMachine) (string, error) {
453+
func (r *OpenStackMachineReconciler) getBootstrapData(ctx context.Context, machine *clusterv1.Machine, openStackMachine *infrav1.OpenStackMachine) (string, error) {
454454
if machine.Spec.Bootstrap.DataSecretName == nil {
455455
return "", errors.New("error retrieving bootstrap data: linked Machine's bootstrap.dataSecretName is nil")
456456
}
457457

458458
secret := &corev1.Secret{}
459459
key := types.NamespacedName{Namespace: machine.Namespace, Name: *machine.Spec.Bootstrap.DataSecretName}
460-
if err := r.Client.Get(context.TODO(), key, secret); err != nil {
460+
if err := r.Client.Get(ctx, key, secret); err != nil {
461461
return "", errors.Wrapf(err, "failed to retrieve bootstrap data secret for Openstack Machine %s/%s", machine.Namespace, openStackMachine.Name)
462462
}
463463

@@ -485,14 +485,14 @@ func (r *OpenStackMachineReconciler) requeueOpenStackMachinesForUnpausedCluster(
485485
return nil
486486
}
487487

488-
return r.requestsForCluster(log, c.Namespace, c.Name)
488+
return r.requestsForCluster(ctx, log, c.Namespace, c.Name)
489489
}
490490
}
491491

492-
func (r *OpenStackMachineReconciler) requestsForCluster(log logr.Logger, namespace, name string) []ctrl.Request {
492+
func (r *OpenStackMachineReconciler) requestsForCluster(ctx context.Context, log logr.Logger, namespace, name string) []ctrl.Request {
493493
labels := map[string]string{clusterv1.ClusterLabelName: name}
494494
machineList := &clusterv1.MachineList{}
495-
if err := r.Client.List(context.TODO(), machineList, client.InNamespace(namespace), client.MatchingLabels(labels)); err != nil {
495+
if err := r.Client.List(ctx, machineList, client.InNamespace(namespace), client.MatchingLabels(labels)); err != nil {
496496
log.Error(err, "Failed to get owned Machines, skipping mapping.")
497497
return nil
498498
}

0 commit comments

Comments
 (0)